Refactor Comunio - Playoff relation