Simplified data scope resolution added.