Some revision for the scope/bundle impls