Removed obsolete methods
Cached Entity registry results
Removed offending type customization
Improved Entity class hierarchy