Updated to new build system