Added checks for other HTML elements