Updated model with dates