Add when/node definitions
Merge pull request #3329 from Nemo157/when/node

Add when/node definitions