Improving the editor plugin integration