refactoring config and indroduced settings