Added Base Configuration Handling