Added support for short format timestamps.