more jackson refactors