Updated some parts in order to make it work for cloudbees.