Refactor calls to be more generic.