Refactor using Jackson as Provider