Refactor make compatible