Parser now handles nodes with arbitrary names instead of just numbers