Don't use the ref here.
Update version info.
Add more type hints and increment version number.
Resolve conflicts.