Update on #17

Updated response to have exactly the structure as in cs-api. (response, count)