db creation rework
Changed Base to Model