Added subtypes from sets since Dragon's Maze