Moved Timestamps to Message