id -> uuid, url -> href, per spec change