Rework with OMAPI