Add first version of selection mechanism