Update for shadow dom usage