Added and updated many new entities
Added new entities and updated existing
Cleaning up the entities.