Adde SelectionHandlerAdapter and BeforeSelectionHandlerAdapter