change EntityType from class to enum #22