improve multi-edition support