Add logic for A3 type