Implemented automatic remove of temporay datasets
Added support for folders