management scripts improvement