Convert to use polymorphic scope configuration