rework for cloud foundry usage