[WIP] Extend #357