Refactored configuration for readability