Updated Controller and Data

to support the adjusted Feedback Constructors