Refactor and simplify support for Basic Calls