Add support for 3.8 and 3.9