Added tags to data model