Add support for 2.2+ devices