Updated a few things in order to work with bluemix