Do better user tracking :3.
Add support for extended-join