outsource entity methods and cleanup structure for upcoming changes