Refactor
Add OnOneItemSelected