Change to Jackson implementation