Added the non-Bluemix mode