Use JID in more places instead of Strings

Description

This allows better typesafety, removal of duplicate code, etc...

Environment

None
Fixed

Assignee

David Smith

Reporter

David Smith