ODRA refactoring.