Add support for 2.x