Improvements and feature additions to AQL
Missed in last commit