Added handling for more response types