Added new tool and updated discover