Add support for 2.0.1 and 2.1.2