Changes to support ncube-editor