PDIO-231 Finish migration to JSON4S