Changed to new build system