[FIX] Conforming to the latest spec of the gateway services protocol