Added JSON Marshaller to create better formatted JSON.