Better feature linking