Fix JSON to make generic