Expand scope check