Improve augment function and expand pr() logger