Improved overall functionality of the deployment