Updated to use BeamParams class