Revert Extension methods to return Collection instead of List