Adapted the base resource to use the new query interface