Removed scoped settings and added the current scope into settings themselves.