Build tools enhancements