[MOD] Use faster newer MakeYourOwnCommands API. See #506