Added support for H4, H5, H6
Tool creation refactoring