Refactored default configuration