diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 32875f5..c88c25d 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -19,6 +19,9 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
@@ -87,7 +90,7 @@ endif
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
 ;
 
 [Files_install]
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 224b29c..2476fa4 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -1,21 +1,33 @@
-##############################################################################
-# This optional file "builder-targets-cb.sh" will be called by builder.sh 
-#
-#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
-#  callbacks: cb_package_makeproductfile
-#
-##############################################################################
+############################
+# Setup product information 
+############################
+VENDOR="softmaker.de"
+PN="pmviewer"
+VERSION="2010"
+RELEASE="10"
+PRIORITY="0"
+ADVICE=""
 
+TYPE="restrict"
 
-function create() { 
-    echo  "Create"
-    builder_create
-}
+#####################
+# File object array
+#####################
+
+FILE[0]="SoftMaker-Logo.png_medium.png"
+SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
+
+FILE[1]="PlanMakerViewer2010.msi"
+SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi"
+ARCH[1]="X86"
+WINST[1]="InstallMsi"
+
+# Download direct the executable
+#FILE[1]="TMViewerSetup.exe"
+#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
+#ARCH[1]="X86"
+#WINST[1]="InstallExe"
+
+# File array index for the image showing while installing the program
+ICON_FILE_INDEX=0
 
-function cleanup() {
-    echo "Cleanup:"
-    
-    local opsi_file=${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi
-    cp -av ${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi  /tmp
-    chmod 666 /tmp/${OPSI_REPOS_FILE_PATTERN}.opsi
-}