Refactor using Jackson