Finished functionality of discovery and validation