Improving some aspects related to imports