Move all functions for entity in new class