Update to make dojo code generation work