Starting to change to include property in message.