Changed loader classes