Beginning of Cloud Foundry support