Added deployment support