Make the extension more robust by not relying so heavily on selectors