Added new tasks as per TODO