Updated the JSON mapping to remove null-values from the serialization