add real world class, cleaned up entity class