Added delimiter option