Refactoring and using HvLink