Port to new introspection bindings