updated model to avoid keyword date;