Update for OSG work