Added AQL, tags, simplification