Yep, you’re right. We have an upcoming feature that’ll prevent this (node families).
You can read through this thread to learn how it’ll work.