Further properties discovery improvements