Updates for v2 Queryable API
2.0.1