Add support for custom delimiters