More generic editing