Update to the new build system