More changes
Added a few new entities