Format parsing now handles commas