DeclNode refactor