More flexible device editing