Refactor. Don't define modules with module id