Improve deploy script capability