Added ability to specify dataset attributes