Bug fix / comment improvement.
Config refactoring - tree data sources.