Replaced Loader class usage with Callable