Add DELIMITER support