Update the models to handle dates properly