Update to new build system