Now DS is a template class

Signed-off-by: olgerd27 <olgerd27@gmail.com>