Fixed: Scope implementation