Editor factory improvements