Added support for Timeouts when waiting for edge change