Updated to reflect new build system