Modify import to be compatible with ST2 and ST3