Added 'tags' field to data model