Improve Node Typing

Summary

The typing of the nodes doesn't work as intended

Explain your context

(Explain what you did.)

What is the expected correct behavior? What was your goal?

(What you should see instead.)

What is the current bug behavior?

(What actually happens.)