Add option to override OFL