Fixed #29: Separate out the JSON component.