Add some Bib-1/SRU diagnostics + mappings