Update for the new build system