Using a scope registry for better referencing

and minimizing repeated data....