Refactor jsonActionResolver