Refactor: Use receiver node as parent