Renamed classes
Minor changes
Added new entity type