Added basic timestamp tracking.