Updated setup.js to work with watson data store better