Refactoring towards backward compatibility (WiP)