Changes in TaskController and some more classes.