Added one-time message functionality
Updated one-time message system