Feature parity after refactoring