Modifications in editor and template engine