Added support for Time field