Deploy tools and script improved