Editor and Framework improveents