Added more ES6 features to the controller.