Update Server to pass through timestamps