Adding support for existing datasets