Fee refactor