Modifications to adopt new link v4