updated models to reflect DB schema changes