Added tags to scenarios