refactored models into common