[api] Preparing for supporting extra server responses #1