Added support for CF/Bluemix