This should probably be in a different branch to avoid mixing response data from different CS endpoints