Rafael extends with OL through 2021