Added scoped queries