Add app-id
Set correct message type in response