Added date and time formatting