Binding v2 - fix wrong imports from binding v1