Added support for timestamp format