Reply utilities rework
Minor updates