Setup tools changes