Added SingleDraw control for #291