Refactored
Added a scope attribute