Add dungeon, refactoring map