Update to use rustpkg