Update to use latest base and project standards