Added support for different delimiters