Started to move towards modularization of importers