Adds service retrieval support in metadata providers