Update on base entity methods