Use refactored module