Updated for Cloud Foundry