Back to AQuery
Prepare for v0.6.1