Added 'scope' and 'vocabulary' criteria