Added map and methods for entities