Added setting and fixed issue with property value being blank.