Support for 2.11 and 2.10