Update to work with the Shadow DOM