Handle the case for Selectable

ping @danizord @Orkin

This aims to be replacement for #123