Moved some logic to Loaders