Added support for application-specific configuration for a few options