Added rOCCI support