Update for new build system