Added DS support (needs format changes)