Updated message objects to provide user ID as well