Refactor incall association