Merge branch 'feature/struct' into develop
Merge branch 'feature/struct' into develop
Updated table and test data