Changes to support bluemix environment