UNSTABLE: Settings refactoring
UNSTABLE: Settings Refactoring