Added tags in the data model