Added scoping to models