Added currentTimestamp to Clock