security update and more descriptive map