Upgrade and refactor custom json messages