Major updates for FindElements