add missing models, entity and move base class