Tweak NS-API to allow custom data sources