updates to message store handling