Massive renamed and added new tools