Make model domains mandatory
WIP switching to synthesis