Restructured queries, queryables and providers