Added delimiter as an option