Data source is now a respected nonStandardField
Improving the configuration system.