Added TODO for removing base import