better import handling