Modifications to adopt new link v2