Added small state intermediary tables