Update checks to include more tags