Updated to match changed timestamp function in Common.  Made timestamps optional in messages.