Using new definitions types.
Improved parser.