added support for 2.1 and 2.2