SB-208: Configuration refactoring