More refactoring for handling response from CB