- Replace builtin generic type annotations with classes from Typing - Replace union type expressions with Union and Optional