1) Properties validator added\n2) Minor changes