Added support for cloud foundry