Changes for new LibOGC