Add preliminary table constraints; update templates to differentiate states
Fix state on DropTableTemplate