Fixed JSON mapping by adding data to JSON conversion