Finish out database model