Refactoring: Basic module