Updated framework to support better editing.