Improve scoped