Dino catalog v2 

It's strange for this mapping to live in a method about file parsing. Can you find a better place to put it?