Minor changes and preparations for IMPORT/EXPORT methods.