Added support for pa and swipe gestures