adding support for time fields