Added preliminary module import parsing