Changed "message" key to be optional