Further changes for multi editor support