Enhance the *edit* and *upgrade* actions