updates to data sources to deal with nas explicitely in the config objects