Extending the flexibility and efficiency in the use of the HPD database, S-57 format Additional Military Layer (AML) products can be produced and updated using the HPD AML Editor program. The HPD AML Editor works from the same common source database features, and has similar functionality to the HPD S-57 ENC Editor program. Users select which AML product category to process, and operate on database features matching that category to produce and update S-57 AML products.