Toolbox extended for YMCSC