Update to work with intirim Bosh