Add categories to group elements
Add categories to group elements

- Token
- Entity

Extract property key to its own section.

opencypher/openCypher,opencypher/openCypher,opencypher/openCypher,opencypher/openCypher