add table structure
Merge origin/master