Add hacky joindin linking support