Updated set of tools