[IMP] refactoring config