Adding tags to specification and scenario