Update to ES6 and consume the data service