Using AR 3 query API
This is a temporal fix