ICallLike changes and refactoring