Updated some deprecated imports