Adding in commandNode and command_stream structs