Added Tables map for submission