Better link resolution