Refactor call method