Feature/node refactor

Don't we need null check for properties and actions.