changed core classes to work in MDRLoader