changed core classes