Added beam mode option