More robust import: makes the code not break in future releases