Adapt to idgen modifications
Merge branch 'master' of https://github.com/dane-unltd/engine