Added support for version 3.10