Changed creature checks to support sub-classes