Upgrade sample project to use latest work