Import changes.

No longer importing full modules when not necessary.