Bosh suite improvements v2