A quick hack for minimal AQL support