Merge branch 'definitions-as-class'