Updated Dungeon Class