#8 - improve mapping to OLAC