Updated compatibility up to version 3.9