Added TODO about the import structure