Add separate class for data extraction

It's needed for the reports