Add generic attribute matching to Singularity.