[WIP] Improve: relationship keys