Improve deployment