Improve the schema to use fromAddress and message timestamp as the entityid