Added some better support for selectable properties