Improve toolset configuration