Map split into Map and MapFile
Better bib handling