Refactoring to not call __call directly