added tagging model
Merge branch 'dev'