Refactoring, separate CreatureTypes