Refactored module to work with modman