Added some groundwork for DFATables