Added new tasks and structure