Updated object imports for the new packages.