Added swipe support