Config refactored