Add selection mechanism