Use model URIs instead of strings in Parser