buildtools enhancements