More generic matching of system properties