Rework how to deal with Remote Service Metadata