Better PropertiesMatcher