Update: refactore response protocol compatibility