Add some updates for output messages