Adding more to the new build system, refs #613