Update for handling more imports/exports. Imports still need to be handled properly.