Made changes to Tasker class