#SB-208: Configuration refactoring

Applied required refactoring.