changed the way how option kind is stored/obtained