Adding the forgotten data tables and also fixing an issue on them.