Added client timestamp handling