Added two way bindings instead of handleChanges