Update to use latest shared code