Use new build tools