Configurations refactored