Accessory now set.

Updated some integrity constraints