Added handling of timestamps.