Last modifications before starting design refactoring