Refactoring for Nancy Module support