Update to 2.2, better support for other libraries providing the same code