Added time formatting