Unique constraints; further denormalization