Update more files to use JID objects