Refactored configuration options;