This shouldn't be needed state should be maintained in the BaseEntity