Support newer opal versions