Make imports more universally friendly