More strict imports