Implemented changes in tools for running in the new workflow