Using external agency URI where applicable. Closes #43