Add support for comma delimter