Updated to use different imports on ST2 and ST3