if find it dangerous to change the API. we should move the jid to core, but still expose the objects as if nothing has changed