URIs fixed as discussed with A. Paffenholz