WIP RIFEQ support