Add support for 2.1.2