Added beam option
Added check for beam