Improve system-manifest script