Add code to handle delimiters