Change import strategy?