Add conversion for ',' and '.'