Rig manager improvement