Fee refactoring