MSetting refactor