Improved deploy pattern