Make derived def instead of given#58

danslapman merged 2 commits intomainleviysoft/oolong:mainfrom

feature/no-auto-modeleviysoft/oolong:feature/no-auto-modeCopy head branch name to clipboard