Lost the legacy implementation in the refactorings