Added some more tags to check