security mapping improvement