Change for new syntax of submodule