Updated 2.2 compatibility