Updated table def
Merge branch 'master'