Changed structure. Prepared for Dungeon Mapper.