ODE: Added identity wrapper. Constants: Moved constants outside namespace