Add saving to server sample for v2