diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java b/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java
index 566c377..c434a94 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java
@@ -9,7 +9,7 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
  *
  * @author jomu
  */
-abstract class Content {
+abstract class Content implements TemplateSerializeable {
 
     protected PDFDocument document;
     protected PDRectangle rect;
@@ -47,6 +47,8 @@ abstract class Content {
 
     protected abstract Coordinate addContentToPdf(PDPageContentStream cos) throws IOException, ConfigurationException;
 
+    public abstract String getTemplateJsonString();
+
     /* *** getter / setter *** */
     public float getX() {
         return x;
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRow.java b/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRow.java
index ea6d0d9..2fc8337 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRow.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRow.java
@@ -8,7 +8,7 @@ import java.util.List;
  *
  * @author joern.muehlencord
  */
-class DefaultTableRow extends TableRow {
+class DefaultTableRow extends TableRow implements TemplateSerializeable {
 
     @Expose
     private final List<TextElement> row;
@@ -33,6 +33,33 @@ class DefaultTableRow extends TableRow {
         this.varName = null;
     }
 
+    @Override
+    public String getTemplateJsonString() {
+        // copy object, null values for listName and isList so they are no longer printed in the template
+        DefaultTableRow newRow = new DefaultTableRow ();
+        newRow.row.addAll(this.row);
+        newRow.padding.addAll(this.padding);
+        newRow.isList = null;
+        newRow.listName = null;
+        newRow.varName = null;
+        
+        String returnValue = GsonUtil.getInstance().toJson(newRow);
+        if (isList()) {
+            String listStartString = "<#list ";
+            listStartString += getListName();
+            listStartString += " as ";
+            listStartString += getVarName();
+            listStartString += ">\n";
+
+            String listEndString = "<#if (" + getVarName() + "?has_next)>,</#if>";
+            listEndString += "</#list>\n";
+
+            returnValue = listStartString + returnValue + listEndString;
+        }
+
+        return returnValue;
+    }
+
     @Override
     protected void addColumn(TextElement element) {
         row.add(element);
@@ -64,13 +91,14 @@ class DefaultTableRow extends TableRow {
     @Override
     protected float getCellPadding(int columnPos) {
         Float currentPadding = padding.get(columnPos);
-        if (currentPadding  == null) {
+        if (currentPadding == null) {
             return 0F;
         } else {
-            return currentPadding ;
+            return currentPadding;
         }
     }
-    
+
+    @Override
     protected String getFontAlias(int columnPos) {
         return row.get(columnPos).getFontAlias();
     }
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRowTypeAdapterFactory.java b/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRowTypeAdapterFactory.java
new file mode 100644
index 0000000..64346c3
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/DefaultTableRowTypeAdapterFactory.java
@@ -0,0 +1,25 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+class DefaultTableRowTypeAdapterFactory extends GsonCustomizedTypeAdapterFactory<DefaultTableRow> {
+
+    protected DefaultTableRowTypeAdapterFactory() {
+        super(DefaultTableRow.class);
+    }
+
+    @Override
+    protected JsonElement updateElement(JsonElement toSerialize) {
+
+        JsonObject elem = toSerialize.getAsJsonObject();
+        final JsonObject member = new JsonObject();
+        member.addProperty("type", DefaultTableRow.class.getName());
+        member.add("data", toSerialize.getAsJsonObject());
+        return member;
+    }
+}
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/GsonCustomizedTypeAdapterFactory.java b/pdf/src/main/java/de/muehlencord/shared/pdf/GsonCustomizedTypeAdapterFactory.java
new file mode 100644
index 0000000..45316b0
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/GsonCustomizedTypeAdapterFactory.java
@@ -0,0 +1,74 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+abstract class GsonCustomizedTypeAdapterFactory<C> implements TypeAdapterFactory {
+
+    protected final Class<C> customizedClass;
+
+    public GsonCustomizedTypeAdapterFactory(Class<C> customizedClass) {
+        this.customizedClass = customizedClass;
+    }
+
+    /**
+     * Override this to muck with {@code toSerialize} before it is written to
+     * the outgoing JSON stream.
+     */
+    protected void beforeWrite(C source, JsonElement toSerialize) {
+        // do nothing in default implementation
+    }
+
+    /**
+     * Override this to muck with {@code deserialized} before it parsed into the
+     * application type.
+     */
+    protected void afterRead(JsonElement deserialized) {
+        // do nothing in default implementation
+    }
+
+    protected JsonElement updateElement(JsonElement toSerialize) {
+        // do nothing in default implementation
+        return toSerialize;
+    }
+
+    @Override
+    public final <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+        TypeAdapter<T> returnValue = null;
+        if (customizedClass.isAssignableFrom(type.getRawType())) {
+            returnValue = (TypeAdapter<T>) customizeMyClassAdapter(gson, (TypeToken<C>) type);
+        }
+        return returnValue;
+    }
+
+    private TypeAdapter<C> customizeMyClassAdapter(Gson gson, TypeToken<C> type) {
+        final TypeAdapter<C> delegate = gson.getDelegateAdapter(this, type);
+        final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+        return new TypeAdapter<C>() {
+            @Override
+            public void write(JsonWriter out, C value) throws IOException {
+                JsonElement tree = delegate.toJsonTree(value);
+                tree = updateElement(tree);
+                beforeWrite(value, tree);
+                elementAdapter.write(out, tree);
+            }
+
+            @Override
+            public C read(JsonReader in) throws IOException {
+                JsonElement tree = elementAdapter.read(in);
+                afterRead(tree);
+                return delegate.fromJsonTree(tree);
+            }
+        };
+    }
+}
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/GsonUtil.java b/pdf/src/main/java/de/muehlencord/shared/pdf/GsonUtil.java
index a0447c9..02622c9 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/GsonUtil.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/GsonUtil.java
@@ -9,14 +9,22 @@ import com.google.gson.GsonBuilder;
  */
 class GsonUtil {
 
-    protected final static Gson getGsonInstance() {
-        return new GsonBuilder()
-                .setPrettyPrinting()
-                .excludeFieldsWithoutExposeAnnotation()
-                .registerTypeAdapter(Content.class, new InterfaceAdapter<>())
-                .registerTypeAdapter(TableRow.class, new InterfaceAdapter<>())                                
-                .registerTypeAdapter(CellValue.class, new InterfaceAdapter<>()) 
-                .create();
+    private final static Gson INSTANCE = new GsonBuilder()
+            .setPrettyPrinting()
+            .excludeFieldsWithoutExposeAnnotation()
+             .registerTypeAdapter(Content.class, new InterfaceAdapter<>())
+             .registerTypeAdapter(TableRow.class, new InterfaceAdapter<>())
+             .registerTypeAdapter(CellValue.class, new InterfaceAdapter<>())            
+            .registerTypeAdapterFactory(new PDFImageContentTypeAdapterFactory())
+            .registerTypeAdapterFactory(new PDFTableContentTypeAdapterFactory())
+            .registerTypeAdapterFactory(new PDFTextContentTypeAdapterFactory())            
+            .registerTypeAdapterFactory(new DefaultTableRowTypeAdapterFactory())
+            .registerTypeAdapterFactory(new TextCellValueTypeAdapterFactory())
+            .create();
+    
+    protected final static Gson getInstance() {
+        return INSTANCE;
     }
 
 }
+
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/InterfaceAdapter.java b/pdf/src/main/java/de/muehlencord/shared/pdf/InterfaceAdapter.java
index 8cbeb2d..30678eb 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/InterfaceAdapter.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/InterfaceAdapter.java
@@ -1,8 +1,8 @@
 package de.muehlencord.shared.pdf;
 
 import com.google.gson.JsonDeserializationContext;
-import java.lang.reflect.Type;
 import com.google.gson.JsonDeserializer;
+import java.lang.reflect.Type;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
@@ -19,7 +19,7 @@ class InterfaceAdapter<T> implements JsonSerializer<T>, JsonDeserializer<T> {
     public final JsonElement serialize(final T object, final Type interfaceType, final JsonSerializationContext context) {
         final JsonObject member = new JsonObject();
         member.addProperty("type", object.getClass().getName());
-        member.add("data", context.serialize(object));
+        member.add("data", context.serialize(object, object.getClass()));
         return member;
     }
 
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java
index 86832c7..bc2eaa4 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java
@@ -2,8 +2,10 @@ package de.muehlencord.shared.pdf;
 
 import com.google.gson.annotations.Expose;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -27,7 +29,7 @@ public class PDFDocument {
 
     @Expose
     private final List<Content> contentList;
-    
+
     private PDDocument pdDocument;
 
     public PDFDocument(PDFPaperSize ps) {
@@ -37,83 +39,51 @@ public class PDFDocument {
         this.fontMap = null;
     }
 
-    public String toJson() {
-        return GsonUtil.getGsonInstance().toJson(this);
-    }
-
-    public String fromJson() {
-        return GsonUtil.getGsonInstance().toJson(this);
-    }
-
-    public String getTemplateString() throws TemplateException {
-
-        ConcurrentLinkedDeque<Integer> bracketStack = new ConcurrentLinkedDeque<>();
-        int currentPosInTemplate = 0;
-        int currentStartOfSubelement = 0;
-        String templateString = GsonUtil.getGsonInstance().toJson(this);
-        String typeSearchString = " \"type\": \"de.muehlencord.shared.pdf.DefaultTableRow\"";
-        while (templateString.indexOf(typeSearchString, currentPosInTemplate) > 0) {
-            // get next element
-            currentPosInTemplate = templateString.indexOf(typeSearchString, currentPosInTemplate);
-            int posOpenBracket = templateString.substring(currentStartOfSubelement, currentPosInTemplate).lastIndexOf("{") + currentStartOfSubelement;
-            int posCloseBracket;
-            // store position of 1st open bracket
-            bracketStack.push(posOpenBracket);
-
-            // work until closing bracket for this element
-            while ((!bracketStack.isEmpty()) && (currentPosInTemplate < templateString.length())) {
-                currentPosInTemplate += 1;
-                char currentChar = templateString.charAt(currentPosInTemplate);
-                if (currentChar == '{') {
-                    // new open bracket found
-                    posOpenBracket = currentPosInTemplate;
-                    bracketStack.push(posOpenBracket);
-                } else if (currentChar == '}') {
-                    if (bracketStack.isEmpty()) {
-                        throw new TemplateException("Found closing bracket, but missing open bracket");
-                    }
-                    // new open bracket found
-                    posCloseBracket = currentPosInTemplate;
-                    posOpenBracket = bracketStack.pop();
-                    if (bracketStack.isEmpty()) {
-                        // next element starts behing the closing bracket earliests
-                        currentStartOfSubelement = posCloseBracket + 1;
-
-                        String jsonSubString = templateString.substring(posOpenBracket, posCloseBracket + 1);
-
-                        // insert the list values into the gson string
-                        TableRow element = GsonUtil.getGsonInstance().fromJson(jsonSubString, TableRow.class);
-                        if (element.isList()) {
-                            String listStartString = "<#list ";
-                            listStartString += element.getListName();
-                            listStartString += " as ";
-                            listStartString += element.getVarName();
-                            listStartString += ">\n";
-                            
-                            String listEndString = "<#if ("+element.getVarName()+"?has_next)>,</#if>";
-                            listEndString += "</#list>\n";
-                            
-                            String newString = templateString.substring(0, posOpenBracket);
-                            newString += listStartString;
-                            newString += templateString.substring(posOpenBracket, posCloseBracket+1);
-                            newString += listEndString;
-                            newString += templateString.substring(posCloseBracket+1, templateString.length());
-
-                            templateString = newString;
-                            currentPosInTemplate += listStartString.length();
-                            currentPosInTemplate += listEndString.length();
-                        }
-                    }
-                }
+    public String getTemplateString() {
+        StringBuilder sb = new StringBuilder();
+        int indent = 0; // TODO add indent support
+        sb.append("{\n");
+        
+        // paper size
+        sb.append("\"paperSize\": ");
+        sb.append(paperSize.getTemplateJsonString());
+        sb.append(",\n");
+        
+        // standardFOnt
+        sb.append ("\"standardFont\": ");
+        sb.append (standardFont.getTemplateJsonString()); 
+        sb.append (",\n");
+        
+        
+        sb.append("\"fontMap\": {\n");
+        Iterator<Map.Entry<String, PDFFont>> it = fontMap.entrySet().iterator();
+        while (it.hasNext()) {
+            Entry<String, PDFFont> entry = it.next();
+            sb.append("\"").append(entry.getKey()).append("\": ");
+            sb.append (entry.getValue().getTemplateJsonString()); 
+            if (it.hasNext()) {
+                sb.append(",");
             }
-            if (!bracketStack.isEmpty()) {
-                throw new TemplateException("Exception - stack not empty but end of string reached");
-            }
-        } // for all types
+            sb.append("\n");
+        }
+        sb.append ("},\n"); // fontMap
+        
+        sb.append ("\"contentList\": [\n");
+        Iterator<Content> contentIterator = contentList.iterator();
+        while (contentIterator.hasNext()) {
+            Content content = contentIterator.next();
+            String contentString = content.getTemplateJsonString();
+            sb.append (contentString);
+            if (contentIterator.hasNext())
+                sb.append (",");
+            sb.append ("\n");            
+        }
+        sb.append ("]\n");
 
-        return templateString;
+        sb.append("}"); // closing pdfDocument
+        return sb.toString();
     }
-
+    
     public void addFont(String name, PDFFont font) {
         if (fontMap == null) {
             fontMap = new ConcurrentHashMap<>();
@@ -168,6 +138,5 @@ public class PDFDocument {
     public void setPdDocument(PDDocument pdDocument) {
         this.pdDocument = pdDocument;
     }
-        
 
 }
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFFont.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFFont.java
index 6d3afd9..2ae1a81 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFFont.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFFont.java
@@ -6,7 +6,7 @@ import com.google.gson.annotations.Expose;
  *
  * @author jomu
  */
-public class PDFFont {
+public class PDFFont implements TemplateSerializeable {
     
     @Expose
     private String fontName;
@@ -26,6 +26,13 @@ public class PDFFont {
         this.fontSize = fontSize;
         this.padding = padding;
     }    
+
+    @Override
+    public String getTemplateJsonString() {
+        return GsonUtil.getInstance().toJson (this);
+    }
+    
+    
             
     /* *** getter / setter *** */
 
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContent.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContent.java
index 11f7b22..0ef22b1 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContent.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContent.java
@@ -14,7 +14,7 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
  *
  * @author joern.muehlencord
  */
-public class PDFImageContent extends Content {
+public class PDFImageContent extends Content implements TemplateSerializeable {
 
     @Expose
     private Float scale = null;
@@ -69,7 +69,18 @@ public class PDFImageContent extends Content {
         this.scale = scale;
         this.base64CodedImage = ImageUtil.getEncodedString(img);
     }
-
+    
+    
+    /**
+     * defaut toJson implementation uses standard JSON string
+     * @return 
+     */
+    @Override
+    public String getTemplateJsonString() {
+        String returnValue = GsonUtil.getInstance().toJson(this);
+        return returnValue;
+    }    
+        
     @Override
     protected Coordinate addContentToPdf(PDPageContentStream cos) throws IOException, ConfigurationException {
         BufferedImage image = ImageUtil.getImageFromEncodedString(base64CodedImage);
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContentTypeAdapterFactory.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContentTypeAdapterFactory.java
new file mode 100644
index 0000000..3acb8f2
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFImageContentTypeAdapterFactory.java
@@ -0,0 +1,23 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+class PDFImageContentTypeAdapterFactory extends GsonCustomizedTypeAdapterFactory<PDFImageContent> {
+
+    protected PDFImageContentTypeAdapterFactory() {
+        super(PDFImageContent.class);
+    }
+
+    @Override
+    protected JsonElement updateElement(JsonElement toSerialize) {
+        final JsonObject member = new JsonObject();
+        member.addProperty("type", PDFImageContent.class.getName());
+        member.add("data", toSerialize.getAsJsonObject());
+        return member;
+    }
+}
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFPaperSize.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFPaperSize.java
index 92939dc..5120f88 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFPaperSize.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFPaperSize.java
@@ -1,15 +1,10 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package de.muehlencord.shared.pdf;
 
 /**
  *
  * @author jomu
  */
-public enum PDFPaperSize {
+public enum PDFPaperSize implements TemplateSerializeable {
     
     A4("A4");
     
@@ -22,5 +17,12 @@ public enum PDFPaperSize {
     public String getLabel() {
         return label;
     }
+
+    @Override
+    public String getTemplateJsonString() {
+        return GsonUtil.getInstance().toJson(this); 
+    }
+    
+    
     
 }
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java
index d3391d3..12f3563 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java
@@ -1,9 +1,11 @@
 package de.muehlencord.shared.pdf;
 
+import com.google.gson.Gson;
 import com.google.gson.annotations.Expose;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
@@ -37,6 +39,38 @@ public class PDFTableContent extends Content {
         this.data = new ArrayList<>();
     }
 
+    /**
+     * defaut toJson implementation uses standard JSON string
+     *
+     * @return
+     */
+    @Override
+    public String getTemplateJsonString() {
+        Gson gson = GsonUtil.getInstance();
+        StringBuilder sb = new StringBuilder();
+        sb.append ("{\n");
+        sb.append ("\"type\": "); 
+        sb.append ("\"").append(this.getClass().getName()).append ("\",\n");
+        sb.append ("\"data\": {");
+        sb.append ("\"columSizes\": ");
+        sb.append (gson.toJson(columSizes)); 
+        sb.append (",\"data\": [");
+        Iterator<TableRow> it = data.iterator();
+        while (it.hasNext()) {
+            TableRow row = it.next();
+            sb.append (row.getTemplateJsonString()); 
+            if (it.hasNext()) {
+                sb.append (",\n");
+            }            
+        }
+        sb.append ("]\n"); // data array
+        sb.append ("}\n");  // data list
+        sb.append ("}\n"); // pdf table object
+        
+        return sb.toString();
+        // return GsonUtil.getInstance().toJson(this);
+    }
+
     public PDFTableContent addColumn(float size) {
         // TODO check if enough columns are defined
         this.columSizes.add(new ColumnDefinition(size));
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContentTypeAdapterFactory.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContentTypeAdapterFactory.java
new file mode 100644
index 0000000..52abcec
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContentTypeAdapterFactory.java
@@ -0,0 +1,23 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+class PDFTableContentTypeAdapterFactory extends GsonCustomizedTypeAdapterFactory<PDFTableContent> {
+
+    protected PDFTableContentTypeAdapterFactory() {
+        super(PDFTableContent.class);
+    }
+
+    @Override
+    protected JsonElement updateElement(JsonElement toSerialize) {
+        final JsonObject member = new JsonObject();
+        member.addProperty("type", PDFTableContent.class.getName());
+        member.add("data", toSerialize.getAsJsonObject());
+        return member;
+    }
+}
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java
index fe373c0..8e1738d 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java
@@ -47,7 +47,7 @@ public class PDFTemplate {
         String json = out.toString();
         LOGGER.debug(json);
 
-        Gson gson = GsonUtil.getGsonInstance();
+        Gson gson = GsonUtil.getInstance();
         PDFDocument pdfDoc = gson.fromJson(json, PDFDocument.class);
         pdfDoc.setPdDocument(new PDDocument());
 
@@ -61,20 +61,15 @@ public class PDFTemplate {
         }
         pdfDoc.getPdDocument().addPage(page);
 
-        PDPageContentStream cos = new PDPageContentStream(pdfDoc.getPdDocument(), page, AppendMode.APPEND, false);
-        Coordinate coord = new Coordinate(page.getMediaBox().getLowerLeftX(), page.getMediaBox().getUpperRightY());
-        for (Content content : pdfDoc.getContentList()) {
-            content.setDocument(pdfDoc); // FIXME move to serialization            
-            content.setRect(page.getMediaBox());
-            content.setCoordinate(coord);
-            coord = content.addContentToPdf(cos);
+        try (PDPageContentStream cos = new PDPageContentStream(pdfDoc.getPdDocument(), page, AppendMode.APPEND, false)) {
+            Coordinate coord = new Coordinate(page.getMediaBox().getLowerLeftX(), page.getMediaBox().getUpperRightY());
+            for (Content content : pdfDoc.getContentList()) {
+                content.setDocument(pdfDoc); // FIXME move to serialization
+                content.setRect(page.getMediaBox());
+                content.setCoordinate(coord);
+                coord = content.addContentToPdf(cos);
+            }
         }
-        cos.close();
         pdfDoc.getPdDocument().save(filenName);
     }
-
-    void applyTemplate(Template template) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
 }
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContent.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContent.java
index fbb09d0..ec05cdf 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContent.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContent.java
@@ -32,6 +32,17 @@ public class PDFTextContent extends Content {
         this.textLines.add(new TextElement(text));
     }
 
+    /**
+     * defaut toJson implementation uses standard JSON string
+     *
+     * @return
+     */
+    @Override
+    public String getTemplateJsonString() {
+        String returnValue =  GsonUtil.getInstance().toJson(this);
+        return returnValue;
+    }
+
     public PDFTextContent addLine() {
         this.textLines.add(new TextElement());
         return this;
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContentTypeAdapterFactory.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContentTypeAdapterFactory.java
new file mode 100644
index 0000000..fbada4b
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTextContentTypeAdapterFactory.java
@@ -0,0 +1,23 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+class PDFTextContentTypeAdapterFactory extends GsonCustomizedTypeAdapterFactory<PDFTextContent> {
+
+    protected PDFTextContentTypeAdapterFactory() {
+        super(PDFTextContent.class);
+    }
+
+    @Override
+    protected JsonElement updateElement(JsonElement toSerialize) {
+        final JsonObject member = new JsonObject();
+        member.addProperty("type", PDFTextContent.class.getName());
+        member.add("data", toSerialize.getAsJsonObject());
+        return member;
+    }
+}
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/TableRow.java b/pdf/src/main/java/de/muehlencord/shared/pdf/TableRow.java
index 501fe84..3e471a1 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/TableRow.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/TableRow.java
@@ -4,7 +4,7 @@ package de.muehlencord.shared.pdf;
  *
  * @author joern.muehlencord
  */
-abstract class TableRow {
+abstract class TableRow implements TemplateSerializeable {
     
     protected abstract TableRow createList(String listName, String varName);
 
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/TemplateSerializeable.java b/pdf/src/main/java/de/muehlencord/shared/pdf/TemplateSerializeable.java
new file mode 100644
index 0000000..b3a4729
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/TemplateSerializeable.java
@@ -0,0 +1,11 @@
+package de.muehlencord.shared.pdf;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+interface TemplateSerializeable {
+
+    String getTemplateJsonString();
+
+}
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/TextCellValueTypeAdapterFactory.java b/pdf/src/main/java/de/muehlencord/shared/pdf/TextCellValueTypeAdapterFactory.java
new file mode 100644
index 0000000..5736c99
--- /dev/null
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/TextCellValueTypeAdapterFactory.java
@@ -0,0 +1,23 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+class TextCellValueTypeAdapterFactory extends GsonCustomizedTypeAdapterFactory<TextCellValue> {
+
+    protected TextCellValueTypeAdapterFactory() {
+        super(TextCellValue.class);
+    }
+
+    @Override
+    protected JsonElement updateElement(JsonElement toSerialize) {
+        final JsonObject member = new JsonObject();
+        member.addProperty("type", TextCellValue.class.getName());
+        member.add("data", toSerialize.getAsJsonObject());
+        return member;
+    }
+}
diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/DefaultTableRowTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/DefaultTableRowTest.java
index 88c4c0c..0151f43 100644
--- a/pdf/src/test/java/de/muehlencord/shared/pdf/DefaultTableRowTest.java
+++ b/pdf/src/test/java/de/muehlencord/shared/pdf/DefaultTableRowTest.java
@@ -27,7 +27,7 @@ public class DefaultTableRowTest {
 "          }";
                          
         
-        TableRow tableRow = GsonUtil.getGsonInstance().fromJson(jsonString, TableRow.class); 
+        TableRow tableRow = GsonUtil.getInstance().fromJson(jsonString, TableRow.class); 
         assertNotNull ("tableRowObject", tableRow);
         assertEquals ("column count", 2, tableRow.getColumnCount()); 
         assertFalse ("isList", tableRow.isList());         
diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/PDFFontTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/PDFFontTest.java
new file mode 100644
index 0000000..a54f401
--- /dev/null
+++ b/pdf/src/test/java/de/muehlencord/shared/pdf/PDFFontTest.java
@@ -0,0 +1,24 @@
+package de.muehlencord.shared.pdf;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+public class PDFFontTest {
+
+    public PDFFontTest() {
+    }
+
+    @Test
+    public void testTemplateSerialisation() {
+        PDFFont font = new PDFFont("Test", 12, 0);
+        String gsonString = GsonUtil.getInstance().toJson(font);
+        String templateString = font.getTemplateJsonString();
+        System.out.println(templateString);
+        assertEquals(gsonString, templateString);
+    }
+
+}
diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/PDFImageContentTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/PDFImageContentTest.java
new file mode 100644
index 0000000..5bd49a8
--- /dev/null
+++ b/pdf/src/test/java/de/muehlencord/shared/pdf/PDFImageContentTest.java
@@ -0,0 +1,26 @@
+package de.muehlencord.shared.pdf;
+
+import java.io.File;
+import java.io.IOException;
+import org.junit.Test;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+public class PDFImageContentTest {
+
+    public PDFImageContentTest() {
+    }
+
+    @Test
+    public void testImage() throws IOException {
+
+        PDFDocument doc = new PDFDocument(PDFPaperSize.A4);
+        PDFImageContent logoContent = new PDFImageContent(doc, 400F, 700F, 0.6F, new File("c:/temp/logo-verkehrsverein-hoevelh.jpg"));
+
+        System.out.println(GsonUtil.getInstance().toJson(logoContent));
+        System.out.println(GsonUtil.getInstance().toJson(logoContent));
+    }
+
+}
diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/PDFTextContentTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/PDFTextContentTest.java
new file mode 100644
index 0000000..8f89617
--- /dev/null
+++ b/pdf/src/test/java/de/muehlencord/shared/pdf/PDFTextContentTest.java
@@ -0,0 +1,39 @@
+package de.muehlencord.shared.pdf;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.junit.Test;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+public class PDFTextContentTest {
+
+    @Test
+    public void testSomeMethod() {
+        PDFDocument doc = new PDFDocument(PDFPaperSize.A4);
+        PDFTextContent informationContent = new PDFTextContent(doc, 400F, 662F);
+        informationContent.addLine("Anzeigenabrechnung", "bold");
+        informationContent.addLine("Veronika Mühlencord", "helv12");
+        informationContent.addLine("Telefon: 05257/940154", "helv12");
+        informationContent.addLine("Telefax: 05257/940156", "helv12");
+        informationContent.addLine();
+        informationContent.addLine("Hövelhof, den ${invoice.invoiceDate?date}", "bold");
+        doc.addContent(informationContent);
+
+        // System.out.println (informationContent.getTemplateJsonString());
+        // System.out.println ("*****");
+        // System.out.println (GsonUtil.getGsonInstance().toJson(informationContent)); 
+        System.out.println("*****");
+
+        Gson gson = new GsonBuilder()
+                .registerTypeAdapterFactory(new PDFImageContentTypeAdapterFactory())
+                .setPrettyPrinting()
+                .excludeFieldsWithoutExposeAnnotation()
+                .create();
+
+        System.out.println(gson.toJson(informationContent, PDFTextContent.class));
+    }
+
+}
diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/TextTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/TextTest.java
index 6f1fb4f..c715a02 100644
--- a/pdf/src/test/java/de/muehlencord/shared/pdf/TextTest.java
+++ b/pdf/src/test/java/de/muehlencord/shared/pdf/TextTest.java
@@ -18,7 +18,7 @@ public class TextTest {
                 + "\"text\": \"Rechnungs-Nr.:\"\n"
                 + "}";
         
-        TextElement text = GsonUtil.getGsonInstance().fromJson(jsonString, TextElement.class);
+        TextElement text = GsonUtil.getInstance().fromJson(jsonString, TextElement.class);
         assertNotNull ("text object", text);
         assertEquals ("text value", "Rechnungs-Nr.:", text.getText());