Changes, new class for loading data