Revise namevalue table to a better format
Revise namevalue table to a better format