Another attempt at TABLE_PER_CLASS with internal use of Sets instead of Lists