Using new JSON marshaller
Using new JSON to POJO mapper
Added unit tests