Added editor generation