Added deployment features