Refactored Dungeon so it doesn't have any List instance