Better logic for objects returned by the entity methods