Loaders refactor
Manager Refactor