Better type linking