Modifications to adopt new link v3