Add more tags to check