Removed EntityType
Merge branch 'EntityType'