#40 Configuration refactoring: Introduced validation phase