Updated for Cloud Foundry v2.