Added hit test support