changed class template to reflect changes of scala version