add roundtrip classes