Making scopes generic.


Signed-off-by: Tihomir Gvero <tihomir.gvero@gmail.com>


Signed-off-by: Tihomir Gvero <tihomir.gvero@gmail.com>