Added missing Tags table, updated relationships for tables.
Merge remote-tracking branch 'origin/master'