Updated to include state table