Update class for typehint change in 1.3.6