Added more tools for scrutinizer.