Added support for collecting timestamps.