Refactored VersionedGestureDetector