Which also means we can use non-datasources, which require a small tweak
to fit the interface.