Added setting for custom delimiter