added optionality of property
fixed identification of sample properties