Implemented simple option-based property refinement.