Quick refactoring for new settings