Add onSelect callback option