More code changes for importing