Changed for Cloud Foundry