Add Better editing utilities