Better delimiter handling