added core classes, except data scrapers