refactored default configuration handling