Adding AbstractQuery module