Make Section/Clause use Mappings rather than List Loaders