Refactor params->message
Refactor message params to recipient and resource