Added Cloud Foundry support