PM-592 redesign logging