Changes in Controller, Data and Feedback

Update of the named components to support the new, more sophisticated
return class Feedback.