added timestamp to Message etc.