Added entity class for objects