Improve Selectable class