Worklist Helper Refactor
Worklist Refactor : Merge Conflict