Rolled back a few changes in loaders but keept defined function