Added comments and renamed some methods/classes for more consistency
New utility allowing to add scopes stored  as Enum