Disabled scope resolution based on template, since API is deprecated