Address warning that message prop is depreciated