Adding more robust editing capability.