Use cleaner storage API
Update message
Improved duplicate message detection