Further work on parsing
- Rewrite of the readers
- Better definition of mappings