Add EnityType class
Minor cleanup
wip