Added tools
Adapting to path changes