Refactor these RPCs to facilitate their use in other Management functionalities, not only Configuration Management.