Table fix and add constraint arrays