Config refactoring
Merge branch 'config_fix'