Added some classes to handle Matrix, JourneySummary, etc.