Added timestamping support.