Make gsv snippet easier to handle