Update for OOCSI 0.5