BZ-9741 Added more capability to the tools