add classes for roundtrip