Add Message entity and required map configuration