Added handling of commas and carriers