[FA, VA] {refactoring} Entity, MapManagement

Creation of MapManagement class, replaced code in entity class