Setup discovery and other goodies