Made multi-attribute compatible