Update to build with cargo