Added basic discovery tool.