refactored all the message and identity old calling conventions