Added suppert for reuse scopes