Added 2.11.0 compatibility