Adopts CloudBridge 0.6 changes.