updated models to account for Date