Added MessageStore