Add support for 3.2