Added state to Requirement returns, as well as handling probability (hopefully) in the property case