Added support for time