Better import parser