Bug 9302: Add aq tables to mapping