reworking models into common syntax