Refactoring RestClientManagerAndListener