Updated to use new build system.