Adds no-query fallback classes