Updated for oseraf