More changes to datetime