Add GT07 support