Added more flexible Primo catalog URL type, and some more libraries.