Binding generator v2 - Type reference fix