Now process start on discovery
Merged with previous changes