Add proper validation for configuration options
Add proper validation for configuration options