Added DELIMITER support