Add imports that were accidentally removed