Smart configuration loading added