Moved discovery to an external services