Updated for OSE 2.1.