Added deployment changes to base code and template