Add back in tooltip handling.