Change to reflect the changed structured of JSON