Index: ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/STKTemplateModel.java
===================================================================
--- ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/STKTemplateModel.java	(revision 41263)
+++ ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/STKTemplateModel.java	(revision )
@@ -82,7 +82,7 @@
  * @version $Id: MainTemplateModel.java 19969 2008-11-17 16:37:48Z pbracher $
  *
  */
-public class STKTemplateModel extends RenderingModelImpl<STKTemplate> {
+public class STKTemplateModel<RD extends STKTemplate> extends RenderingModelImpl<RD> {
 
     private static Logger log = LoggerFactory.getLogger(STKTemplateModel.class);
 
@@ -91,7 +91,7 @@
      */
     private Site site;
 
-    public STKTemplateModel(Content content, STKTemplate definition, RenderingModel parent) {
+    public STKTemplateModel(Content content, RD definition, RenderingModel parent) {
         super(content, definition, parent);
     }
 
Index: ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/style/CssSelectorBuilder.java
===================================================================
--- ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/style/CssSelectorBuilder.java	(revision 41263)
+++ ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/style/CssSelectorBuilder.java	(revision )
@@ -79,7 +79,7 @@
         final StringBuffer cssSelector = new StringBuffer();
         RenderingModel rootModelObj = model.getRoot();
         if((rootModelObj instanceof STKTemplateModel)){
-            final STKTemplateModel rootModel = (STKTemplateModel) rootModelObj;
+            final STKTemplateModel<STKTemplate> rootModel = (STKTemplateModel) rootModelObj;
             final STKTemplate rootDef = rootModel.getDefinition();
             
             // body id
Index: ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/style/BodyClassResolver.java
===================================================================
--- ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/style/BodyClassResolver.java	(revision 41263)
+++ ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/style/BodyClassResolver.java	(revision )
@@ -89,7 +89,7 @@
         return allowedBodyClasses;
     }
 
-    public String resolveBodyClass(STKTemplateModel model) {
+    public String resolveBodyClass(STKTemplateModel<? extends STKTemplate> model) {
         final STKTemplate def = model.getDefinition();
         if(StringUtils.isNotEmpty(def.getBodyClass())){
             return def.getBodyClass();
Index: ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java
===================================================================
--- ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java	(revision 41263)
+++ ../magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java	(revision )
@@ -63,7 +63,7 @@
  * @author cringele
  *
  */
-public class SingletonParagraphTemplateModel extends STKTemplateModel {
+public class SingletonParagraphTemplateModel extends STKTemplateModel<STKTemplate> {
 
     private static final String SINGLETON_NODE_NAME = "singleton";