Added basic functionality for Tasks