Updated to find elements by ID