Better import handling