Change to using type hints like everyone else :(