Support new build system