Restructured class/value pairing