Merge s data-classes from Jiří Tomeš