#SB-208: Configuration refactoring

Applied required refactoring.
Merge pull request #4 from strongbox/SB-208

#SB-208: Configuration refactoring