Updated for OPIFoundation 3.5