Added mobs to map. Refactoring