Added support for Timestamp data type