Updated message handing to be universal to all commands