Configuration loader refactoring

:+1: