Added framework for tasks and handlers