Final safe refactoring