Move method to helper class
Moving stuff around
Implement AutoProvider.query