Updated loaders after abstract class refactor