Upgraded to AQuery's latest version