Add structured table variation, fixes #1293 and #1359