Modified DataController
added stubs for DataController
fixed merge conflics