Completed basic entity definition for all major classes