Added Unique constraints where necessary