Updated to handle new version of OPENi types