Begin of refactoring of edit module...