- Refactor, add check to compatible method