Added LinkInfo support