Some reorganizing, create loader class for every object type