Better handling of arranger and editor