Added initial message store