Add template as class parameter

Add the possibility to extend the builder and change the template