Moved entity construct to a base class