Modules: update implementation