Continue to implement timestamps with sync