Enable class extending

Moved logic for loading predefined dataset to final fn