Nagon refactoring