Update with more tags and class to check