Add g-s 3.10 support