Added entity methods to support CSV import