improved loaders
renamed class
changes according to changes in cliff