Added generic tool set