Hector based message store and context store implementation related changes