Changed tag model and table around