make parser use new AQL