Fix up bindings to accept model