Moved data binding to controller classes