2268 - Deal with time aspects in modelling data

Deal with time aspects in modelling data