Added possibility to define scope