Added "Edit command" and "Edit action" support