Update deprecated imports