Solved Issues #49 and #50: Revamping TaskManager