Added things to make the import work