[WIP] Solve cyclic references