Enable and refactor module