Refactoring due to the renaming from scope to bundle