Refactor the List Shape Provider.