HqRegistry improvement