Updated patch with logical properties. Attached interdiff for same.