Modification of the scope handling for an easier use of it.

Modification of the scope handling for an easier use of it.