SLT-274 Refactoring to accomodate RevokeTasks instead of only MethodTasks