Updated for dynamic discovery

Added dynamic link discover (for add, remove is disabled for now)