New implementation after fixing GAS model (Refer RoyalCaliber/VertexAPI2)