Refactored configuration module