Add 2.1+ backward compatibility