Further changes for Callable interface rather than Closure