add gst 1.x support