Update DataController for asynchronousity