From d6319dd0d8d7d6684f4b7a7a04c2b38623b07c43 Mon Sep 17 00:00:00 2001
From: "minkee.lee" <minkee.lee@samsung.com>
Date: Mon, 3 Aug 2015 14:57:47 +0900
Subject: [PATCH] template: preparing template version 2.

- Added new schema & java class.
- Introduced template loader & template.

Change-Id: I5078610ede385a9a68ec4df13599ec135524485f
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---
 .../manager/vms/xml/template2/Information.java     | 127 +++++++++++
 .../emulator/manager/vms/xml/template2/Item.java   | 196 ++++++++++++++++
 .../manager/vms/xml/template2/ItemGroup.java       | 106 +++++++++
 .../manager/vms/xml/template2/ItemList2.java       | 131 +++++++++++
 .../manager/vms/xml/template2/ObjectFactory.java   |  79 +++++++
 .../emulator/manager/vms/xml/template2/Option.java | 128 +++++++++++
 .../manager/vms/xml/template2/package-info.java    |   9 +
 .../tizen/emulator/manager/platform/BaseImage.java |  14 +-
 .../tizen/emulator/manager/platform/Platform.java  | 134 ++++-------
 .../tizen/emulator/manager/platform/Profile.java   |   2 +-
 .../manager/resources/FilePathResources.java       |   7 +
 .../CustomPropertyTemplateLoader.java              |   8 +-
 .../tizen/emulator/manager/template/ITemplate.java |  46 ++++
 .../tizen/emulator/manager/template/Template1.java | 110 +++++++++
 .../tizen/emulator/manager/template/Template2.java |  99 ++++++++
 .../emulator/manager/template/TemplateLoader.java  | 184 +++++++++++++++
 src/org/tizen/emulator/manager/ui/VMsMainView.java |   4 +-
 .../emulator/manager/ui/detail/DetailViewPage.java |  10 +-
 .../emulator/manager/ui/detail/PInfoViewPage.java  |  60 ++---
 .../manager/ui/detail/PModifyViewPage.java         |  57 ++---
 .../ui/detail/item/property/BaseImageViewItem.java |   2 +-
 .../loader/CustomPropertyTemplateLoader.java       | 248 ---------------------
 .../emulator/manager/ui/list/TreeListView.java     |   2 +-
 .../emulator/manager/vms/VMPropertyValue.java      |   4 +-
 xsd/em-template2.xsd                               |  47 ++++
 xsd/x86-standard-template2.xml                     | 127 +++++++++++
 26 files changed, 1503 insertions(+), 438 deletions(-)
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Information.java
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Item.java
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemGroup.java
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemList2.java
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ObjectFactory.java
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Option.java
 create mode 100644 jaxb_src/org/tizen/emulator/manager/vms/xml/template2/package-info.java
 rename src/org/tizen/emulator/manager/{platform => template}/CustomPropertyTemplateLoader.java (97%)
 create mode 100644 src/org/tizen/emulator/manager/template/ITemplate.java
 create mode 100644 src/org/tizen/emulator/manager/template/Template1.java
 create mode 100644 src/org/tizen/emulator/manager/template/Template2.java
 create mode 100644 src/org/tizen/emulator/manager/template/TemplateLoader.java
 delete mode 100644 src/org/tizen/emulator/manager/ui/detail/item/template/loader/CustomPropertyTemplateLoader.java
 create mode 100644 xsd/em-template2.xsd
 create mode 100644 xsd/x86-standard-template2.xml

diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Information.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Information.java
new file mode 100644
index 0000000..617ea95
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Information.java
@@ -0,0 +1,127 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+
+package org.tizen.emulator.manager.vms.xml.template2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for information complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="information">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="profile" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="image" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "information")
+public class Information {
+
+    @XmlAttribute(name = "profile", required = true)
+    protected String profile;
+    @XmlAttribute(name = "image")
+    protected String image;
+    @XmlAttribute(name = "version")
+    protected String version;
+
+    /**
+     * Gets the value of the profile property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getProfile() {
+        return profile;
+    }
+
+    /**
+     * Sets the value of the profile property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProfile(String value) {
+        this.profile = value;
+    }
+
+    /**
+     * Gets the value of the image property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getImage() {
+        if (image == null) {
+            return "";
+        } else {
+            return image;
+        }
+    }
+
+    /**
+     * Sets the value of the image property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setImage(String value) {
+        this.image = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        if (version == null) {
+            return "";
+        } else {
+            return version;
+        }
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+}
diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Item.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Item.java
new file mode 100644
index 0000000..e4d1ca1
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Item.java
@@ -0,0 +1,196 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+
+package org.tizen.emulator.manager.vms.xml.template2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for item complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="item">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="option" type="{http://www.tizen.org/em/template}option" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="item" type="{http://www.tizen.org/em/template}item" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ *       &lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "item", propOrder = {
+    "option",
+    "item"
+})
+public class Item {
+
+    protected List<Option> option;
+    protected List<Item> item;
+    @XmlAttribute(name = "name", required = true)
+    protected String name;
+    @XmlAttribute(name = "type")
+    protected String type;
+    @XmlAttribute(name = "title")
+    protected String title;
+
+    /**
+     * Gets the value of the option property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the option property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOption().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Option }
+     * 
+     * 
+     */
+    public List<Option> getOption() {
+        if (option == null) {
+            option = new ArrayList<Option>();
+        }
+        return this.option;
+    }
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the item property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getItem().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Item }
+     * 
+     * 
+     */
+    public List<Item> getItem() {
+        if (item == null) {
+            item = new ArrayList<Item>();
+        }
+        return this.item;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        if (type == null) {
+            return "";
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        if (title == null) {
+            return "";
+        } else {
+            return title;
+        }
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+}
diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemGroup.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemGroup.java
new file mode 100644
index 0000000..3a026b5
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemGroup.java
@@ -0,0 +1,106 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+
+package org.tizen.emulator.manager.vms.xml.template2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for itemGroup complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="itemGroup">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="item" type="{http://www.tizen.org/em/template}item" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "itemGroup", propOrder = {
+    "item"
+})
+public class ItemGroup {
+
+    protected List<Item> item;
+    @XmlAttribute(name = "name")
+    protected String name;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the item property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getItem().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Item }
+     * 
+     * 
+     */
+    public List<Item> getItem() {
+        if (item == null) {
+            item = new ArrayList<Item>();
+        }
+        return this.item;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        if (name == null) {
+            return "";
+        } else {
+            return name;
+        }
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+}
diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemList2.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemList2.java
new file mode 100644
index 0000000..532b731
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ItemList2.java
@@ -0,0 +1,131 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+
+package org.tizen.emulator.manager.vms.xml.template2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="information" type="{http://www.tizen.org/em/template}information" minOccurs="0"/>
+ *         &lt;element name="itemGroup" type="{http://www.tizen.org/em/template}itemGroup" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "information",
+    "itemGroup"
+})
+@XmlRootElement(name = "ItemList2")
+public class ItemList2 {
+
+    protected Information information;
+    protected List<ItemGroup> itemGroup;
+    @XmlAttribute(name = "version", required = true)
+    protected String version;
+
+    /**
+     * Gets the value of the information property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Information }
+     *     
+     */
+    public Information getInformation() {
+        return information;
+    }
+
+    /**
+     * Sets the value of the information property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Information }
+     *     
+     */
+    public void setInformation(Information value) {
+        this.information = value;
+    }
+
+    /**
+     * Gets the value of the itemGroup property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the itemGroup property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getItemGroup().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ItemGroup }
+     * 
+     * 
+     */
+    public List<ItemGroup> getItemGroup() {
+        if (itemGroup == null) {
+            itemGroup = new ArrayList<ItemGroup>();
+        }
+        return this.itemGroup;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+}
diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ObjectFactory.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ObjectFactory.java
new file mode 100644
index 0000000..7caa089
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/ObjectFactory.java
@@ -0,0 +1,79 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+
+package org.tizen.emulator.manager.vms.xml.template2;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.tizen.emulator.manager.vms.xml.template2 package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.tizen.emulator.manager.vms.xml.template2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ItemList2 }
+     * 
+     */
+    public ItemList2 createItemList2() {
+        return new ItemList2();
+    }
+
+    /**
+     * Create an instance of {@link Information }
+     * 
+     */
+    public Information createInformation() {
+        return new Information();
+    }
+
+    /**
+     * Create an instance of {@link ItemGroup }
+     * 
+     */
+    public ItemGroup createItemGroup() {
+        return new ItemGroup();
+    }
+
+    /**
+     * Create an instance of {@link Item }
+     * 
+     */
+    public Item createItem() {
+        return new Item();
+    }
+
+    /**
+     * Create an instance of {@link Option }
+     * 
+     */
+    public Option createOption() {
+        return new Option();
+    }
+
+}
diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Option.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Option.java
new file mode 100644
index 0000000..e973825
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/Option.java
@@ -0,0 +1,128 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+
+package org.tizen.emulator.manager.vms.xml.template2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for option complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="option">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       &lt;attribute name="attr" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" default="" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "option", propOrder = {
+    "value"
+})
+public class Option {
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "name", required = true)
+    @XmlSchemaType(name = "anySimpleType")
+    protected String name;
+    @XmlAttribute(name = "attr")
+    @XmlSchemaType(name = "anySimpleType")
+    protected String attr;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the attr property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAttr() {
+        if (attr == null) {
+            return "";
+        } else {
+            return attr;
+        }
+    }
+
+    /**
+     * Sets the value of the attr property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAttr(String value) {
+        this.attr = value;
+    }
+
+}
diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/package-info.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/package-info.java
new file mode 100644
index 0000000..7af938e
--- /dev/null
+++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/template2/package-info.java
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.08.03 at 02:50:57 PM KST 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tizen.org/em/template", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.tizen.emulator.manager.vms.xml.template2;
diff --git a/src/org/tizen/emulator/manager/platform/BaseImage.java b/src/org/tizen/emulator/manager/platform/BaseImage.java
index f142adc..28234b7 100644
--- a/src/org/tizen/emulator/manager/platform/BaseImage.java
+++ b/src/org/tizen/emulator/manager/platform/BaseImage.java
@@ -39,11 +39,11 @@ import java.util.logging.Level;
 import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.resources.FilePathResources;
 import org.tizen.emulator.manager.resources.StringResources;
+import org.tizen.emulator.manager.template.ITemplate;
 import org.tizen.emulator.manager.vms.SKIN_SHAPE;
 import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.VMProperty.Architecture;
 import org.tizen.emulator.manager.vms.option.IOption;
-import org.tizen.emulator.manager.vms.xml.template.ItemList;
 
 public class BaseImage {
 	protected Platform platform;
@@ -65,7 +65,7 @@ public class BaseImage {
 	private String information;
 
 	protected VMProperty defaultProperty;
-	protected ItemList itemList;
+	protected ITemplate itemTemplate;
 
 	protected List<IOption> optionList;
 	//private LaunchConfig launchTemplate; // TODO replace xDefaultOption.java
@@ -168,7 +168,7 @@ public class BaseImage {
 
 	public List<IOption> getOptionList() {
 		if (optionList == null) {
-			optionList = platform.loadOptionList(getItemList());
+			optionList = itemTemplate.makeOptionList(platform.getPlugin());
 		}
 		return optionList;
 	}
@@ -177,8 +177,8 @@ public class BaseImage {
 		return defaultProperty;
 	}
 
-	public ItemList getItemList() {
-		return itemList;
+	public ITemplate getItemTemplate() {
+		return itemTemplate;
 	}
 
 	public SKIN_SHAPE getSkinShape() {
@@ -295,10 +295,10 @@ public class BaseImage {
 
 	private void loadTemplate() {
 		if (isStandard) {
-			itemList = platform.findItemList(imageName);
+			itemTemplate = platform.findItemTemplate(imageName);
 			defaultProperty = platform.findVMProperty(imageName);
 		} else {
-			itemList = platform.getCustomItemList();
+			itemTemplate = platform.getCustomItemTemplate();
 			defaultProperty = platform.getCustomDefaultProperty();
 		}
 	}
diff --git a/src/org/tizen/emulator/manager/platform/Platform.java b/src/org/tizen/emulator/manager/platform/Platform.java
index dfa8d5c..0522085 100644
--- a/src/org/tizen/emulator/manager/platform/Platform.java
+++ b/src/org/tizen/emulator/manager/platform/Platform.java
@@ -35,25 +35,16 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-
 import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.plugin.EMPlugin;
-import org.tizen.emulator.manager.plugin.ExtensionItem;
 import org.tizen.emulator.manager.plugin.PluginStringResources;
 import org.tizen.emulator.manager.resources.FilePathResources;
 import org.tizen.emulator.manager.resources.StringResources;
-import org.tizen.emulator.manager.vms.EmulatorVMList;
+import org.tizen.emulator.manager.template.ITemplate;
+import org.tizen.emulator.manager.template.TemplateLoader;
 import org.tizen.emulator.manager.vms.RESOLUTION;
 import org.tizen.emulator.manager.vms.SKIN_SHAPE;
 import org.tizen.emulator.manager.vms.VMProperty;
-import org.tizen.emulator.manager.vms.option.IOption;
-import org.tizen.emulator.manager.vms.option.IOptionFactory;
-import org.tizen.emulator.manager.vms.xml.template.ItemList;
 
 public class Platform {
 	public static Platform createInstance(Profile profile, EMPlugin plugin) {
@@ -89,23 +80,13 @@ public class Platform {
 	private EMPlugin plugin;
 
 	// for standard base images
-	private List<VMProperty> propertyList = new ArrayList<VMProperty>();
-	private List<ItemList> itemListList = new ArrayList<ItemList>();
+	private final List<VMProperty> propertyList = new ArrayList<VMProperty>();
+	private final List<ITemplate> itemTemplateList = new ArrayList<ITemplate>();
 	private VMProperty defaultProperty;
-	private ItemList defaultItemList;
+	private ITemplate defaultItemTemplate;
 
 	// for custom base image
-	private ItemList customItemList;
-
-	public static JAXBContext templateContext = null;
-
-	static {
-		try {
-			templateContext = JAXBContext.newInstance(ItemList.class);
-		} catch (JAXBException e){
-			EMLogger.getLogger().info(e.getMessage());
-		}
-	}
+	private ITemplate customItemTemplate;
 
 	private Platform(Profile profile, EMPlugin plugin) {
 		initializePlatform(profile, plugin);
@@ -127,7 +108,7 @@ public class Platform {
 
 		loadSkins();
 		loadPlugin();
-		loadTemplate();
+		TemplateLoader.load(this);
 	}
 
 	private String makingEmulatorDir() {
@@ -172,79 +153,21 @@ public class Platform {
 		return profileClass;
 	}
 
-	public ItemList getCustomItemList() {
-		return customItemList;
+	public ITemplate getCustomItemTemplate() {
+		return customItemTemplate;
 	}
 
 	public VMProperty getCustomDefaultProperty() {
 		return defaultProperty;
 	}
 
-	// Load option list for each image.
-	public List<IOption> loadOptionList(ItemList itemTemplate) {
-		if (plugin != null) {
-			ExtensionItem exItem = getPlugin().getExtensionItem(PluginStringResources.OptionFactory);
-			IOptionFactory f = (IOptionFactory)(exItem.getInstance());
-			if (f != null) {
-				return f.makeOptionList(itemTemplate);
-			}
-		}
-		return null;
-	}
-
-	private void loadTemplate() {
-		File template = new File(platformPath + File.separator
-				+ FilePathResources.getPlatformTemplatePath());
-		if (template == null || !template.exists() || !template.isDirectory()) {
-			return;
-		}
-		for (File f : template.listFiles()) {
-			if (f.getName().contains(PlatformStringResources.TEMPLATE)) { // ui template file for detail view
-				JAXBElement<ItemList> element = null;
-				try {
-					Unmarshaller unmarshaller = templateContext.createUnmarshaller();
-					element = unmarshaller.unmarshal(new StreamSource(f), ItemList.class);
-				} catch (JAXBException e) {
-					e.printStackTrace();
-					EMLogger.getLogger().warning("Can not load config file( " //$NON-NLS-1$
-									+ f.getName() + ")" + StringResources.NEW_LINE + e.getMessage()); //$NON-NLS-1$
-					element = null;
-				}
-				if (element != null) {
-					ItemList itemList = element.getValue();
-					if (itemList != null) {
-						itemListList.add(itemList);
-
-						// setting default item list
-						if (f.getName().contains(PlatformStringResources.STANDARD)) {
-							this.defaultItemList = itemList;
-						}
-					}
-				}
-			} else { // property file
-				EmulatorVMList vmList = EmulatorVMList.getInstance();
-				VMProperty defaultProperty = vmList.parseXML(f);
-				if (defaultProperty != null) {
-					propertyList.add(defaultProperty);
-
-					// setting default property
-					if (f.getName().contains(PlatformStringResources.STANDARD)) {
-						this.defaultProperty = defaultProperty;
-					}
-				}
-			}
-		}
-
-		customItemList = CustomPropertyTemplateLoader.makeCustomPropertyTemplate(itemListList);
-	}
-
-	public ItemList findItemList(String imageName) {
-		for (ItemList itemList : itemListList) {
-			if (itemList.getImage().equals(imageName)) {
-				return itemList;
+	public ITemplate findItemTemplate(String imageName) {
+		for (ITemplate itemTemplate : itemTemplateList) {
+			if (itemTemplate.getImageName().equals(imageName)) {
+				return itemTemplate;
 			}
 		}
-		return defaultItemList;
+		return defaultItemTemplate;
 	}
 
 	public VMProperty findVMProperty(String imageName) {
@@ -268,6 +191,7 @@ public class Platform {
 							+ FilePathResources.getPlatformSkinsPath());
 		if (dir.exists()) {
 			File[] fileList = dir.listFiles(new FileFilter() {
+				@Override
 				public boolean accept(File pathname) {
 					if (!pathname.isDirectory()) {
 						return false;
@@ -339,4 +263,32 @@ public class Platform {
 	public String getEmulatorPath() {
 		return emulatorPath;
 	}
+
+	public List<VMProperty> getPropertyList() {
+		return propertyList;
+	}
+
+	public List<ITemplate> getItemTemplateList() {
+		return itemTemplateList;
+	}
+
+	public VMProperty getDefaultProperty() {
+		return defaultProperty;
+	}
+
+	public void setDefaultProperty(VMProperty defaultProperty) {
+		this.defaultProperty = defaultProperty;
+	}
+
+	public Object getDefaultItemTemplate() {
+		return defaultItemTemplate;
+	}
+
+	public void setDefaultItemTemplate(ITemplate defaultItemTemplate) {
+		this.defaultItemTemplate = defaultItemTemplate;
+	}
+
+	public void setCustomItemTemplate(ITemplate customItemTemplate) {
+		this.customItemTemplate = customItemTemplate;
+	}
 }
diff --git a/src/org/tizen/emulator/manager/platform/Profile.java b/src/org/tizen/emulator/manager/platform/Profile.java
index cfb8ab8..2fb7104 100644
--- a/src/org/tizen/emulator/manager/platform/Profile.java
+++ b/src/org/tizen/emulator/manager/platform/Profile.java
@@ -150,7 +150,7 @@ public class Profile {
 		}
 		for (Platform platform : platformList) {
 			if (platform.getPlugin() != null
-					&& platform.getCustomItemList() != null) {
+					&& platform.getCustomItemTemplate() != null) {
 				return platform;
 			}
 		}
diff --git a/src/org/tizen/emulator/manager/resources/FilePathResources.java b/src/org/tizen/emulator/manager/resources/FilePathResources.java
index 0f4803b..b989c6a 100644
--- a/src/org/tizen/emulator/manager/resources/FilePathResources.java
+++ b/src/org/tizen/emulator/manager/resources/FilePathResources.java
@@ -73,6 +73,7 @@ public class FilePathResources {
 	private final static String sdcard_suffix = File.separator + "sdcard"; //$NON-NLS-1$
 	private final static String skins_suffix = File.separator + "skins"; //$NON-NLS-1$
 	private final static String template_suffix = File.separator + "template"; //$NON-NLS-1$
+	private final static String template2_suffix = File.separator + "template2"; //$NON-NLS-1$
 	private final static String plugins_suffix = File.separator + "plugins"; //$NON-NLS-1$
 
 	private final static String sdkdata_new_emulator_suffix = File.separator + "emulator"; //$NON-NLS-1$
@@ -97,6 +98,7 @@ public class FilePathResources {
 	// Platform
 	private static String platformSkinsPath;
 	private static String platformTemplatePath;
+	private static String platformTemplate2Path;
 	private static String platformPluginsPath;
 	private static String platformImagesPath;
 
@@ -157,6 +159,7 @@ public class FilePathResources {
 
 		platformSkinsPath = resource_suffix + skins_suffix;
 		platformTemplatePath = resource_suffix + template_suffix;
+		platformTemplate2Path = resource_suffix + template2_suffix;
 		platformPluginsPath = resource_suffix + plugins_suffix;
 
 		// SDB path
@@ -455,6 +458,10 @@ public class FilePathResources {
 		return platformTemplatePath;
 	}
 
+	public static String getPlatformTemplate2Path() {
+		return platformTemplate2Path ;
+	}
+
 	public static String getPlatformPluginsPath() {
 		return platformPluginsPath;
 	}
diff --git a/src/org/tizen/emulator/manager/platform/CustomPropertyTemplateLoader.java b/src/org/tizen/emulator/manager/template/CustomPropertyTemplateLoader.java
similarity index 97%
rename from src/org/tizen/emulator/manager/platform/CustomPropertyTemplateLoader.java
rename to src/org/tizen/emulator/manager/template/CustomPropertyTemplateLoader.java
index d4a276f..cadbd8f 100644
--- a/src/org/tizen/emulator/manager/platform/CustomPropertyTemplateLoader.java
+++ b/src/org/tizen/emulator/manager/template/CustomPropertyTemplateLoader.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.tizen.emulator.manager.platform;
+package org.tizen.emulator.manager.template;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -46,21 +46,21 @@ import org.tizen.emulator.manager.vms.xml.template.PropertyList;
 public class CustomPropertyTemplateLoader {
 	public static ObjectFactory factory = new ObjectFactory();
 
-	public static ItemList makeCustomPropertyTemplate(List<ItemList> templateList) {
+	public static ITemplate makeCustomPropertyTemplate(List<ItemList> templateList) {
 		if (templateList.size() == 0) {
 			return null;
 
 		} else if (templateList.size() == 1) {
 			ItemList template = cloneTemplate(templateList.get(0));
 			template.setImage(null);
-			return template;
+			return new Template1(template);
 
 		} else { // Make union set
 			ItemList base = cloneTemplate(templateList.get(0));
 			for (int i=1 ; i < templateList.size() ; i++) {
 				addToBase(base,templateList.get(i));
 			}
-			return base;
+			return new Template1(base);
 		}
 	}
 
diff --git a/src/org/tizen/emulator/manager/template/ITemplate.java b/src/org/tizen/emulator/manager/template/ITemplate.java
new file mode 100644
index 0000000..16cb3b0
--- /dev/null
+++ b/src/org/tizen/emulator/manager/template/ITemplate.java
@@ -0,0 +1,46 @@
+/*
+ * Emulator Manager
+ *
+ * Copyright (C) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:
+ * JiHye Kim <jihye424.kim@samsung.com>
+ * Minkee Lee <minkee.lee@samsung.com>
+ * SeokYeon Hwang <syeon.hwang@samsung.com>
+ * Sangho Park <sangho1206.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+package org.tizen.emulator.manager.template;
+
+import java.util.List;
+
+import org.tizen.emulator.manager.plugin.EMPlugin;
+import org.tizen.emulator.manager.ui.detail.item.IViewItem;
+import org.tizen.emulator.manager.vms.option.IOption;
+
+public interface ITemplate {
+	public String getImageName();
+	public <T extends IViewItem> void makeItemList(EMPlugin plugin, List<T> itemList);
+	public List<IOption> makeOptionList(EMPlugin plugin);
+	public Class<?> getXMLObjectType();
+	public void setXMLObject(Object obj);
+	public Object getXMLObject();
+}
diff --git a/src/org/tizen/emulator/manager/template/Template1.java b/src/org/tizen/emulator/manager/template/Template1.java
new file mode 100644
index 0000000..29f3287
--- /dev/null
+++ b/src/org/tizen/emulator/manager/template/Template1.java
@@ -0,0 +1,110 @@
+/*
+ * Emulator Manager
+ *
+ * Copyright (C) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:
+ * JiHye Kim <jihye424.kim@samsung.com>
+ * Minkee Lee <minkee.lee@samsung.com>
+ * SeokYeon Hwang <syeon.hwang@samsung.com>
+ * Sangho Park <sangho1206.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+package org.tizen.emulator.manager.template;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.tizen.emulator.manager.plugin.EMPlugin;
+import org.tizen.emulator.manager.plugin.ExtensionItem;
+import org.tizen.emulator.manager.plugin.PluginStringResources;
+import org.tizen.emulator.manager.ui.detail.item.IItemListFactory;
+import org.tizen.emulator.manager.ui.detail.item.IViewItem;
+import org.tizen.emulator.manager.vms.option.IOption;
+import org.tizen.emulator.manager.vms.option.IOptionFactory;
+import org.tizen.emulator.manager.vms.xml.template.ItemList;
+
+public class Template1 implements ITemplate {
+
+	private ItemList template;
+
+	public Template1() {
+
+	}
+
+	public Template1(ItemList template) {
+		this.template = template;
+	}
+
+	@Override
+	public String getImageName() {
+		if (template != null) {
+			return template.getImage();
+		}
+		return "";
+	}
+
+	@Override
+	public <T extends IViewItem> void makeItemList(EMPlugin plugin, List<T> itemList) {
+		if (template != null) {
+			ExtensionItem exItem = plugin.getExtensionItem(PluginStringResources.ItemFactory);
+			if (exItem != null) {
+				IItemListFactory f = (IItemListFactory)(exItem.getInstance());
+				if (f != null) {
+					f.makeItemList(itemList, template);
+				}
+			}
+		}
+	}
+
+	@Override
+	public List<IOption> makeOptionList(EMPlugin plugin) {
+		if (template != null) {
+			if (plugin != null) {
+				ExtensionItem exItem = plugin.getExtensionItem(PluginStringResources.OptionFactory);
+				IOptionFactory f = (IOptionFactory)(exItem.getInstance());
+				if (f != null) {
+					return f.makeOptionList(template);
+				}
+			}
+		}
+		return new ArrayList<IOption>();
+	}
+
+	@Override
+	public Class<?> getXMLObjectType() {
+		return ItemList.class;
+	}
+
+	@Override
+	public void setXMLObject(Object obj) {
+		if (obj instanceof ItemList) {
+			template = (ItemList)obj;
+		}
+	}
+
+	@Override
+	public Object getXMLObject() {
+		return template;
+	}
+
+
+}
diff --git a/src/org/tizen/emulator/manager/template/Template2.java b/src/org/tizen/emulator/manager/template/Template2.java
new file mode 100644
index 0000000..2b7b92b
--- /dev/null
+++ b/src/org/tizen/emulator/manager/template/Template2.java
@@ -0,0 +1,99 @@
+/*
+ * Emulator Manager
+ *
+ * Copyright (C) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:
+ * JiHye Kim <jihye424.kim@samsung.com>
+ * Minkee Lee <minkee.lee@samsung.com>
+ * SeokYeon Hwang <syeon.hwang@samsung.com>
+ * Sangho Park <sangho1206.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+package org.tizen.emulator.manager.template;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.tizen.emulator.manager.plugin.EMPlugin;
+import org.tizen.emulator.manager.ui.detail.item.IViewItem;
+import org.tizen.emulator.manager.vms.option.IOption;
+import org.tizen.emulator.manager.vms.xml.template2.ItemList2;
+
+public class Template2 implements ITemplate {
+
+	private ItemList2 template;
+
+	@Override
+	public String getImageName() {
+		if (template != null) {
+			template.getInformation().getImage();
+		}
+		return "";
+	}
+
+	@Override
+	public <T extends IViewItem> void makeItemList(EMPlugin plugin, List<T> itemList) {
+
+//		if (template != null) {
+//			ExtensionItem exItem = plugin.getExtensionItem(PluginStringResources.ItemFactory);
+//			if (exItem != null) {
+//				IItemListFactory f = (IItemListFactory)(exItem.getInstance());
+//				if (f != null) {
+//					f.makeItemList(itemList, template);
+//				}
+//			}
+//		}
+
+	}
+
+	@Override
+	public List<IOption> makeOptionList(EMPlugin plugin) {
+		if (template != null) {
+//			if (plugin != null) {
+//				ExtensionItem exItem = plugin.getExtensionItem(PluginStringResources.OptionFactory);
+//				IOptionFactory f = (IOptionFactory)(exItem.getInstance());
+//				if (f != null) {
+//					return f.makeOptionList(template);
+//				}
+//			}
+		}
+		return new ArrayList<IOption>();
+	}
+
+	@Override
+	public Class<?> getXMLObjectType() {
+		return ItemList2.class;
+	}
+
+	@Override
+	public void setXMLObject(Object obj) {
+		if (obj instanceof ItemList2) {
+			template = (ItemList2)obj;
+		}
+	}
+
+	@Override
+	public Object getXMLObject() {
+		return template;
+	}
+
+}
diff --git a/src/org/tizen/emulator/manager/template/TemplateLoader.java b/src/org/tizen/emulator/manager/template/TemplateLoader.java
new file mode 100644
index 0000000..dbaa365
--- /dev/null
+++ b/src/org/tizen/emulator/manager/template/TemplateLoader.java
@@ -0,0 +1,184 @@
+/*
+ * Emulator Manager
+ *
+ * Copyright (C) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:
+ * JiHye Kim <jihye424.kim@samsung.com>
+ * Minkee Lee <minkee.lee@samsung.com>
+ * SeokYeon Hwang <syeon.hwang@samsung.com>
+ * Sangho Park <sangho1206.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+package org.tizen.emulator.manager.template;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.stream.StreamSource;
+
+import org.tizen.emulator.manager.logging.EMLogger;
+import org.tizen.emulator.manager.platform.Platform;
+import org.tizen.emulator.manager.platform.PlatformStringResources;
+import org.tizen.emulator.manager.resources.FilePathResources;
+import org.tizen.emulator.manager.resources.StringResources;
+import org.tizen.emulator.manager.vms.EmulatorVMList;
+import org.tizen.emulator.manager.vms.VMProperty;
+import org.tizen.emulator.manager.vms.xml.template.ItemList;
+
+public class TemplateLoader {
+
+	private static Map<Class<?>, JAXBContext> contextMap = new HashMap<Class<?>, JAXBContext>();
+
+	public static void load(Platform platform) {
+		if (loadTemplateV2(platform)) {
+			return;
+		}
+		loadTemplateV1(platform);
+	}
+
+	private static boolean loadTemplateV1(Platform platform) {
+		File templateDir = new File(platform.getPlatformPath() + File.separator
+				+ FilePathResources.getPlatformTemplatePath());
+		if (!templateExist(templateDir)) {
+			return false;
+		}
+
+		loadToPlatform(templateDir, Template1.class, platform);
+
+		// Set custom template
+		List<ItemList> templateListV1 = new ArrayList<ItemList>();
+		for (ITemplate template : platform.getItemTemplateList()) {
+			if (template instanceof Template1) {
+				templateListV1.add((ItemList)template.getXMLObject());
+			}
+		}
+		platform.setCustomItemTemplate(
+				CustomPropertyTemplateLoader.makeCustomPropertyTemplate(templateListV1));
+		return true;
+	}
+
+	private static boolean loadTemplateV2(Platform platform) {
+		File templateDir = new File(platform.getPlatformPath() + File.separator
+				+ FilePathResources.getPlatformTemplate2Path());
+		if (!templateExist(templateDir)) {
+			return false;
+		}
+
+		loadToPlatform(templateDir, Template2.class, platform);
+
+		// Actually, custom itemTemplate is not needed in new UI.
+		if (platform.getItemTemplateList().size() > 0) {
+			platform.setCustomItemTemplate(platform.getItemTemplateList().get(0));
+		}
+		return true;
+	}
+
+
+	private static boolean templateExist(File template) {
+		if (template == null || !template.exists() || !template.isDirectory()) {
+			return false;
+		}
+		return true;
+	}
+
+	private static <T> JAXBContext getContext(Class<T> type) {
+		JAXBContext context = contextMap.get(type);
+		if (context == null) {
+			 try {
+				 context = JAXBContext.newInstance(type);
+			 } catch (JAXBException e){
+				 EMLogger.getLogger().info(e.getMessage());
+			 }
+			 if (context != null) {
+				 contextMap.put(type, context);
+			 }
+		}
+		return context;
+	}
+
+	private static <T> Object loadTemplate (File f, Class<T> type) {
+		JAXBElement<T> element = null;
+		JAXBContext context = getContext(type);
+		if (context != null) {
+			try {
+				Unmarshaller unmarshaller = context.createUnmarshaller();
+				element = unmarshaller.unmarshal(new StreamSource(f), type);
+			} catch (JAXBException e) {
+				e.printStackTrace();
+				EMLogger.getLogger().warning("Can not load config file( " //$NON-NLS-1$
+								+ f.getName() + ")" + StringResources.NEW_LINE + e.getMessage()); //$NON-NLS-1$
+				element = null;
+			}
+			if (element != null) {
+				return element.getValue();
+			}
+		}
+		return null;
+
+	}
+
+	// Load template list and default template to platform
+	private static void loadToPlatform(File templateDir, Class<?> type, Platform platform) {
+		for (File f : templateDir.listFiles()) {
+			if (f.getName().contains(PlatformStringResources.TEMPLATE)) { // ui template file for detail view
+				ITemplate template = null;
+				try {
+					template = (ITemplate)type.newInstance();
+				} catch (Exception e) {
+					EMLogger.getLogger().warning("Failed to load template: " + e.getMessage());
+					e.printStackTrace();
+				}
+				if (template != null) {
+					Object xmlObj = loadTemplate(f, template.getXMLObjectType());
+					if (xmlObj != null) {
+						template.setXMLObject(xmlObj);
+						platform.getItemTemplateList().add(template);
+
+						// setting default item list
+						if (f.getName().contains(PlatformStringResources.STANDARD)) {
+							platform.setDefaultItemTemplate(template);
+						}
+					}
+				}
+
+			} else { // property file
+				EmulatorVMList vmList = EmulatorVMList.getInstance();
+				VMProperty defaultProperty = vmList.parseXML(f);
+				if (defaultProperty != null) {
+					platform.getPropertyList().add(defaultProperty);
+
+					// setting default property
+					if (f.getName().contains(PlatformStringResources.STANDARD)) {
+						platform.setDefaultProperty(defaultProperty);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/org/tizen/emulator/manager/ui/VMsMainView.java b/src/org/tizen/emulator/manager/ui/VMsMainView.java
index 0abb4cb..5196bf2 100644
--- a/src/org/tizen/emulator/manager/ui/VMsMainView.java
+++ b/src/org/tizen/emulator/manager/ui/VMsMainView.java
@@ -305,10 +305,10 @@ public class VMsMainView {
 				}
 
 				if (findImage == null
-						|| findImage.getItemList() == null
+						|| findImage.getItemTemplate() == null
 						|| findImage.getPlatform().getPlugin() == null) {
 					for (BaseImage image : profile.getImageList()) {
-						if (image.getItemList() != null && image.getPlatform().getPlugin() != null) {
+						if (image.getItemTemplate() != null && image.getPlatform().getPlugin() != null) {
 							detailView.drawCreateVM(
 									new VMPropertyValue(image));
 							break;
diff --git a/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java b/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java
index dde5b8a..b712970 100644
--- a/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java
@@ -40,7 +40,7 @@ import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.tizen.emulator.manager.platform.Platform;
-import org.tizen.emulator.manager.plugin.ExtensionItem;
+import org.tizen.emulator.manager.plugin.EMPlugin;
 import org.tizen.emulator.manager.resources.ColorResources;
 import org.tizen.emulator.manager.resources.FontResources;
 import org.tizen.emulator.manager.resources.ImageResources;
@@ -83,7 +83,7 @@ public abstract class DetailViewPage {
 	protected final StackLayout stackLayout = new StackLayout();
 	public DetailViewPage(VMsDetailView parent, int style) {
 		this.parent = parent;
-		view = new Composite((Composite)parent.getComposite(), style);
+		view = new Composite(parent.getComposite(), style);
 		view.setLayout(new FormLayout());
 		view.setBackground(ColorResources.DETAIL_VIEW_PAGE_COLOR.getColor());
 
@@ -295,14 +295,14 @@ public abstract class DetailViewPage {
 }
 
 class ViewItemList {
-	ExtensionItem exItem;
+	EMPlugin plugin;
 	Composite comp;
 	Platform platform;
 	String imageName;
 	boolean isCustom;
 
-	public ViewItemList(ExtensionItem exItem, Platform platform, String imageName, boolean isCustom) {
-		this.exItem = exItem;
+	public ViewItemList(EMPlugin plugin, Platform platform, String imageName, boolean isCustom) {
+		this.plugin = plugin;
 		this.platform = platform;
 		this.imageName = imageName;
 		this.isCustom = isCustom;
diff --git a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
index 763856a..c0122fe 100644
--- a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
@@ -30,6 +30,7 @@
 package org.tizen.emulator.manager.ui.detail;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -44,21 +45,19 @@ import org.tizen.emulator.manager.platform.BaseImage;
 import org.tizen.emulator.manager.platform.Platform;
 import org.tizen.emulator.manager.platform.Profile;
 import org.tizen.emulator.manager.platform.ProfileList;
-import org.tizen.emulator.manager.plugin.ExtensionItem;
-import org.tizen.emulator.manager.plugin.PluginStringResources;
+import org.tizen.emulator.manager.plugin.EMPlugin;
 import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.resources.StringResources;
+import org.tizen.emulator.manager.template.ITemplate;
 import org.tizen.emulator.manager.ui.Messages;
 import org.tizen.emulator.manager.ui.VMsDetailView;
 import org.tizen.emulator.manager.ui.VMsMainView;
 import org.tizen.emulator.manager.ui.detail.item.DetailViewItem;
 import org.tizen.emulator.manager.ui.detail.item.IInfoViewItem;
-import org.tizen.emulator.manager.ui.detail.item.IItemListFactory;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
-import org.tizen.emulator.manager.vms.xml.template.ItemList;
 
 public class PInfoViewPage extends DetailViewPage {
 
@@ -110,7 +109,7 @@ public class PInfoViewPage extends DetailViewPage {
 		deleteButton = new ImageButton(buttonComp, SWT.PUSH);
 		deleteButton.setText(StringResources.DELETE);
 		deleteButton.setEnabled(true);
-		
+
 		resetButton = new ImageButton(buttonComp, SWT.PUSH);
 		resetButton.setText(StringResources.RESET);
 		resetButton.setEnabled(true);
@@ -128,7 +127,7 @@ public class PInfoViewPage extends DetailViewPage {
 		data.width = BUTTON_WIDTH;
 		data.height = BUTTON_HEIGHT;
 		deleteButton.setLayoutData(data);
-		
+
 		data = new FormData();
 		data.left = new FormAttachment(deleteButton, 14);
 		data.top = new FormAttachment(0, 0);
@@ -150,9 +149,9 @@ public class PInfoViewPage extends DetailViewPage {
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
-				
+
 			}
-			
+
 		});
 
 		deleteButton.addSelectionListener(new SelectionListener() {
@@ -164,7 +163,7 @@ public class PInfoViewPage extends DetailViewPage {
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
-				
+
 			}
 		});
 
@@ -177,7 +176,7 @@ public class PInfoViewPage extends DetailViewPage {
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
-				
+
 			}
 		});
 	}
@@ -190,34 +189,24 @@ public class PInfoViewPage extends DetailViewPage {
 										Messages.getString("PInfoViewPage.FailedToLoad.0")); //$NON-NLS-1$
 
 		infoItemList = new ArrayList<InfoViewItemList>();
-		ExtensionItem item = null;
 		for (Profile profile : ProfileList.getProfileList()) {
 			for (BaseImage base : profile.getImageList()) {
 				if (base.getPlatform().getPlugin() == null) {
 					continue;
 				}
-				item = base.getPlatform().getPlugin().getExtensionItem(
-						PluginStringResources.ItemFactory);
-				if (item == null) {
-					continue;
-				}
-				ItemList template = base.getItemList();
-				if (template == null) {
+				ITemplate itemTemplate = base.getItemTemplate();
+				if (itemTemplate == null) {
 					continue;
 				}
+				infoItemList.add(new InfoViewItemList(base.getPlatform().getPlugin(), this.getItemListComposite(),
+						itemTemplate, base.getPlatform(), base.getName(), false));
 
-				if (template != null) {
-					infoItemList.add(new InfoViewItemList(item, this.getItemListComposite(),
-							template, base.getPlatform(), base.getName(), false));
-				}
 			}
 			// add item list for custom
 			Platform platform = profile.getAvailablePlatform();
 			if (platform != null) {
-				item = platform.getPlugin().getExtensionItem(
-						PluginStringResources.ItemFactory);
-				infoItemList.add(new InfoViewItemList(item, this.getItemListComposite(),
-						platform.getCustomItemList(),
+				infoItemList.add(new InfoViewItemList(platform.getPlugin(), this.getItemListComposite(),
+						platform.getCustomItemTemplate(),
 						platform, null, true));
 			}
 		}
@@ -335,21 +324,14 @@ public class PInfoViewPage extends DetailViewPage {
 
 class InfoViewItemList extends ViewItemList{
 
-	ArrayList<IInfoViewItem> itemList;
+	List<IInfoViewItem> itemList;
 
-	InfoViewItemList(ExtensionItem item, Composite parent, ItemList template,
+	InfoViewItemList(EMPlugin plugin, Composite parent, ITemplate itemTemplate,
 			Platform platform, String imageName, boolean isCustom) {
-		super(item, platform, imageName, isCustom);
-		makeItemList(parent, template);
-		initItemList(parent);
-	}
-
-	private void makeItemList(Composite parent, ItemList templateList) {
-		IItemListFactory f = (IItemListFactory)(exItem.getInstance());
+		super(plugin, platform, imageName, isCustom);
 		itemList = new ArrayList<IInfoViewItem>();
-		if (f != null) {
-			f.makeItemList(itemList, templateList);
-		}
+		itemTemplate.makeItemList(plugin, itemList);
+		initItemList(parent);
 	}
 
 	private void initItemList(Composite parent){
@@ -358,7 +340,7 @@ class InfoViewItemList extends ViewItemList{
 		IInfoViewItem infoItem = null;
 		DetailViewItem up 	= null;
 		for (int i = 0; i < itemList.size(); i++) {
-			infoItem = (IInfoViewItem) itemList.get(i);
+			infoItem = itemList.get(i);
 			infoItem.initItem(comp, up);
 			infoItem.drawDetail();
 			up = (DetailViewItem) infoItem;
diff --git a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
index ae3ad90..60ef024 100644
--- a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
@@ -31,6 +31,7 @@ package org.tizen.emulator.manager.ui.detail;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.swt.SWT;
@@ -46,11 +47,11 @@ import org.tizen.emulator.manager.platform.BaseImage;
 import org.tizen.emulator.manager.platform.Platform;
 import org.tizen.emulator.manager.platform.Profile;
 import org.tizen.emulator.manager.platform.ProfileList;
-import org.tizen.emulator.manager.plugin.ExtensionItem;
-import org.tizen.emulator.manager.plugin.PluginStringResources;
+import org.tizen.emulator.manager.plugin.EMPlugin;
 import org.tizen.emulator.manager.resources.ImageResources;
 import org.tizen.emulator.manager.resources.PatchImageResources;
 import org.tizen.emulator.manager.resources.StringResources;
+import org.tizen.emulator.manager.template.ITemplate;
 import org.tizen.emulator.manager.ui.MainDialog;
 import org.tizen.emulator.manager.ui.Messages;
 import org.tizen.emulator.manager.ui.VMStatusBar;
@@ -59,7 +60,6 @@ import org.tizen.emulator.manager.ui.VMsMainView;
 import org.tizen.emulator.manager.ui.detail.item.AdvancedViewItem;
 import org.tizen.emulator.manager.ui.detail.item.DetailViewItem;
 import org.tizen.emulator.manager.ui.detail.item.DetailViewItemChangeListener;
-import org.tizen.emulator.manager.ui.detail.item.IItemListFactory;
 import org.tizen.emulator.manager.ui.detail.item.IModifyViewItem;
 import org.tizen.emulator.manager.ui.detail.item.ItemChangeState;
 import org.tizen.emulator.manager.ui.detail.item.ItemState;
@@ -68,7 +68,6 @@ import org.tizen.emulator.manager.ui.dialog.MessageDialog;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.VMPropertyValue;
-import org.tizen.emulator.manager.vms.xml.template.ItemList;
 
 public class PModifyViewPage extends DetailViewPage
 							implements DetailViewItemChangeListener {
@@ -173,24 +172,17 @@ public class PModifyViewPage extends DetailViewPage
 								Messages.getString("PModifyViewPage.FailedToLoad.0")); //$NON-NLS-1$
 
 		modifyItemList = new ArrayList<ModifyViewItemList>();
-		ExtensionItem item = null;
 		for(Profile profile : ProfileList.getProfileList()) {
 			for (BaseImage base : profile.getImageList()) {
 				if (base.getPlatform().getPlugin() == null) {
 					continue;
 				}
-				item = base.getPlatform().getPlugin().getExtensionItem(
-						PluginStringResources.ItemFactory);
-				if (item == null) {
-					continue;
-				}
-				ItemList template = base.getItemList();
+				ITemplate template = base.getItemTemplate();
 				if (template == null) {
 					continue;
 				}
-
 				if (template != null) {
-					modifyItemList.add(new ModifyViewItemList(item, this,
+					modifyItemList.add(new ModifyViewItemList(base.getPlatform().getPlugin(), this,
 							template, base.getPlatform(), base.getName(), false));
 				}
 			}
@@ -198,10 +190,8 @@ public class PModifyViewPage extends DetailViewPage
 			// add item list for custom
 			Platform platform = profile.getAvailablePlatform();
 			if (platform != null) {
-				item = platform.getPlugin().getExtensionItem(
-						PluginStringResources.ItemFactory);
-				modifyItemList.add(new ModifyViewItemList(item, this,
-						platform.getCustomItemList(),
+				modifyItemList.add(new ModifyViewItemList(platform.getPlugin(), this,
+						platform.getCustomItemTemplate(),
 						platform, null, true));
 			}
 		}
@@ -477,32 +467,25 @@ public class PModifyViewPage extends DetailViewPage
 }
 
 class ModifyViewItemList extends ViewItemList{
-	ArrayList<IModifyViewItem> itemList;
+	List<IModifyViewItem> itemList;
 
-	ModifyViewItemList(ExtensionItem item, PModifyViewPage page, ItemList template
+	ModifyViewItemList(EMPlugin plugin, PModifyViewPage page, ITemplate itemTemplate
 			,Platform platform, String imageName, boolean isCustom) {
-		super(item, platform, imageName, isCustom);
-		makeItemList(template);
+		super(plugin, platform, imageName, isCustom);
+		makeItemList(itemTemplate);
 		initItemList(page);
 	}
 
-	private void makeItemList(ItemList deviceItemList) {
-		if (exItem == null) {
-			// TODO
-		} else {
-			IItemListFactory f = (IItemListFactory)(exItem.createInstance());
-			itemList = new ArrayList<IModifyViewItem>();
-			if (f != null) {
-				f.makeItemList(itemList, deviceItemList);
-			}
+	private void makeItemList(ITemplate itemTemplate) {
+		itemList = new ArrayList<IModifyViewItem>();
+		itemTemplate.makeItemList(plugin, itemList);
 
-			Map<String, AdvancedViewItem> itemMap = new HashMap<String, AdvancedViewItem>();
-			for (IModifyViewItem mItem : itemList) {
-				if (mItem instanceof AdvancedViewItem) {
-					AdvancedViewItem item = (AdvancedViewItem)mItem;
-					item.setItemMap(itemMap);
-					itemMap.put(item.getName(), item);
-				}
+		Map<String, AdvancedViewItem> itemMap = new HashMap<String, AdvancedViewItem>();
+		for (IModifyViewItem mItem : itemList) {
+			if (mItem instanceof AdvancedViewItem) {
+				AdvancedViewItem item = (AdvancedViewItem)mItem;
+				item.setItemMap(itemMap);
+				itemMap.put(item.getName(), item);
 			}
 		}
 	}
diff --git a/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java b/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
index e4727a9..ca1406b 100644
--- a/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
+++ b/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
@@ -306,7 +306,7 @@ public class BaseImageViewItem extends ComboViewItem {
 		if (profile != null) {
 			for (BaseImage img : profile.getImageList()) {
 				if (img.getPlatform().getPlugin() != null
-						&& img.getItemList() != null) {
+						&& img.getItemTemplate() != null) {
 					baseImageList.add(img);
 				}
 			}
diff --git a/src/org/tizen/emulator/manager/ui/detail/item/template/loader/CustomPropertyTemplateLoader.java b/src/org/tizen/emulator/manager/ui/detail/item/template/loader/CustomPropertyTemplateLoader.java
deleted file mode 100644
index 6530af5..0000000
--- a/src/org/tizen/emulator/manager/ui/detail/item/template/loader/CustomPropertyTemplateLoader.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Emulator Manager
- *
- * Copyright (C) 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:
- * JiHye Kim <jihye424.kim@samsung.com>
- * Minkee Lee <minkee.lee@samsung.com>
- * SeokYeon Hwang <syeon.hwang@samsung.com>
- * Sangho Park <sangho1206.park@samsung.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contributors:
- * - S-Core Co., Ltd
- *
- */
-
-package org.tizen.emulator.manager.ui.detail.item.template.loader;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.tizen.emulator.manager.ui.detail.item.OptionType;
-import org.tizen.emulator.manager.vms.xml.template.DeviceList;
-import org.tizen.emulator.manager.vms.xml.template.Item;
-import org.tizen.emulator.manager.vms.xml.template.ItemList;
-import org.tizen.emulator.manager.vms.xml.template.ObjectFactory;
-import org.tizen.emulator.manager.vms.xml.template.Option;
-import org.tizen.emulator.manager.vms.xml.template.PropertyList;
-
-public class CustomPropertyTemplateLoader {
-	public static ObjectFactory factory = new ObjectFactory();
-
-	public static ItemList makeCustomPropertyTemplate(List<ItemList> templateList) {
-		if (templateList.size() == 0) {
-			return null;
-
-		} else if (templateList.size() == 1) {
-			ItemList template = cloneTemplate(templateList.get(0));
-			template.setImage(null);
-			return template;
-
-		} else { // Make union set
-			ItemList base = cloneTemplate(templateList.get(0));
-			for (int i=1 ; i < templateList.size() ; i++) {
-				addToBase(base,templateList.get(i));
-			}
-			return base;
-		}
-	}
-
-	private static void addToBase(ItemList base, ItemList newOne) {
-		// Property list add
-		PropertyList newPropertyList = newOne.getPropertyList();
-		PropertyList basePropertyList = base.getPropertyList();
-		if (newPropertyList != null) {
-			if (basePropertyList == null) {
-				basePropertyList = factory.createPropertyList();
-				base.setPropertyList(basePropertyList);
-			}
-			for (Item newItem : newPropertyList.getItem()) {
-				boolean itemExistInBase = false;
-				for (Item baseItem : basePropertyList.getItem()) {
-					if (baseItem.getName().equals(newItem.getName())) {
-						itemExistInBase = true;
-						joinItem(baseItem, newItem);
-					}
-				}
-				if (!itemExistInBase) {
-					basePropertyList.getItem().add(cloneItem(newItem));
-				}
-			}
-		}
-
-		// Device list add
-		DeviceList newDeviceList = newOne.getDeviceList();
-		DeviceList baseDeviceList = base.getDeviceList();
-		if (newDeviceList != null) {
-			if (baseDeviceList == null) {
-				baseDeviceList = factory.createDeviceList();
-				base.setDeviceList(baseDeviceList);
-			}
-			for (Item newItem : newDeviceList.getItem()) {
-				boolean itemExistInBase = false;
-				for (Item baseItem : baseDeviceList.getItem()) {
-					if (baseItem.getName().equals(newItem.getName())) {
-						itemExistInBase = true;
-						joinItem(baseItem, newItem);
-					}
-				}
-				if (!itemExistInBase) {
-					baseDeviceList.getItem().add(cloneItem(newItem));
-				}
-			}
-		}
-	}
-
-	private static void joinItem(Item baseItem, Item newItem) {
-		// join sub items
-		for (Item newSub : newItem.getItem()) {
-			boolean itemExistInBase = false;
-			for (Item baseSub : baseItem.getItem()) {
-				if (baseSub.getName().equals(newSub.getName())) {
-					itemExistInBase = true;
-					joinItem(baseSub, newSub);
-				}
-			}
-			if (!itemExistInBase) {
-				baseItem.getItem().add(cloneItem(newSub));
-			}
-		}
-		// join options
-		for (Option newOption : newItem.getOption()) {
-			boolean optionExistInBase = false;
-			for (Option baseOption : baseItem.getOption()) {
-				if (baseOption.getName().equals(newOption.getName())) {
-					optionExistInBase = true;
-					if (isListOption(baseOption, newOption)) {
-						joinOption(baseOption, newOption);
-					}
-				}
-			}
-
-			if (!optionExistInBase) {
-				baseItem.getOption().add(cloneOption(newOption));
-			}
-		}
-
-	}
-
-	private static void joinOption(Option baseOption, Option newOption) {
-		baseOption.setValue(joinCommaString(baseOption.getValue(), newOption.getValue()));
-	}
-
-	private static String joinCommaString(String base, String newOne) {
-		List<String> optionList = new ArrayList<String>();
-		if (base != null) {
-			String[] split = base.split(","); //$NON-NLS-1$
-			for (String str : split) {
-				optionList.add(str.trim());
-			}
-		}
-		if (newOne != null) {
-			String[] split = newOne.split(","); //$NON-NLS-1$
-			for (String str : split) {
-				optionList.add(str.trim());
-			}
-		}
-
-		if (optionList.size() > 0) {
-			Set<String> optionSet = new HashSet<String>();
-			optionSet.addAll(optionList);
-			optionList.clear();
-			optionList.addAll(optionSet);
-//			Collections.sort(optionList);
-			StringBuilder sb = new StringBuilder();
-
-			for (int i=0 ; i<optionList.size() ; i++) {
-				sb.append(optionList.get(i));
-				if (i < optionList.size()-1) {
-					sb.append(","); //$NON-NLS-1$
-				}
-			}
-
-			return sb.toString();
-		}
-
-		return null;
-	}
-
-	private static ItemList cloneTemplate(ItemList template) {
-		ItemList newTemplate = factory.createItemList();
-		newTemplate.setProfile(template.getProfile());
-		newTemplate.setImage(template.getImage());
-
-		// clone property list
-		PropertyList propertyList = template.getPropertyList();
-		if (propertyList != null) {
-			PropertyList newPropertyList = factory.createPropertyList();
-			newTemplate.setPropertyList(newPropertyList);
-
-			for (Item item : propertyList.getItem()) {
-				newPropertyList.getItem().add(cloneItem(item));
-			}
-		}
-
-		// clone device list.
-		DeviceList deviceList = template.getDeviceList();
-		if (deviceList != null) {
-			DeviceList newDeviceList = factory.createDeviceList();
-			newTemplate.setDeviceList(newDeviceList);
-
-			for (Item item : deviceList.getItem()) {
-				newDeviceList.getItem().add(cloneItem(item));
-			}
-		}
-
-		return newTemplate;
-	}
-
-	private static Item cloneItem(Item item) {
-		Item newItem = factory.createItem();
-		newItem.setType(item.getType());
-		newItem.setName(item.getName());
-		newItem.setTitle(item.getTitle());
-
-		for (Option option : item.getOption()) {
-			newItem.getOption().add(cloneOption(option));
-		}
-
-		for (Item subItem : item.getItem()) {
-			newItem.getItem().add(cloneItem(subItem));
-		}
-
-		return newItem;
-	}
-
-	private static Option cloneOption(Option option) {
-		Option newOption = factory.createOption();
-		newOption.setName(option.getName());
-		newOption.setValue(option.getValue());
-		return newOption;
-	}
-
-	private static boolean isListOption(Option baseOption, Option newOption) {
-		if (baseOption.getName().equals(OptionType.COMBO_LIST.getName())
-				&& newOption.getName().equals(OptionType.COMBO_LIST.getName())) {
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/src/org/tizen/emulator/manager/ui/list/TreeListView.java b/src/org/tizen/emulator/manager/ui/list/TreeListView.java
index 679c837..f7bf016 100644
--- a/src/org/tizen/emulator/manager/ui/list/TreeListView.java
+++ b/src/org/tizen/emulator/manager/ui/list/TreeListView.java
@@ -99,7 +99,7 @@ public class TreeListView extends AbstractListView {
 				// TODO Auto-generated method stub
 				System.out.println("lost focus");
 			}
-			
+
 		});
 		*/
 
diff --git a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java b/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
index 3096ff0..de58065 100644
--- a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
+++ b/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
@@ -145,7 +145,7 @@ public class VMPropertyValue implements Cloneable {
 
 		baseImagePath = image.getPath();
 		if (image.getPlatform().getPlugin() == null
-				|| image.getItemList() == null) {
+				|| image.getItemTemplate() == null) {
 			template.setAvailable(false);
 		}
 	}
@@ -159,7 +159,7 @@ public class VMPropertyValue implements Cloneable {
 		this.baseImage = image;
 		baseImagePath = image.getPath();
 		if (image.getPlatform().getPlugin() == null
-				|| image.getItemList() == null) {
+				|| image.getItemTemplate() == null) {
 			template.setAvailable(false);
 		} else {
 			settingConfigure(baseImage.getDefaultProperty());
diff --git a/xsd/em-template2.xsd b/xsd/em-template2.xsd
new file mode 100644
index 0000000..bb6b726
--- /dev/null
+++ b/xsd/em-template2.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.tizen.org/em/template"
+	xmlns:em-template="http://www.tizen.org/em/template" elementFormDefault="qualified">
+
+	<element name="ItemList2">
+		<complexType>
+				<sequence>
+					<element name="information" type="em-template:information" minOccurs="0" maxOccurs="1"/>
+					<element name="itemGroup" type="em-template:itemGroup" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute name="version" type="string" use="required"/>
+		</complexType>
+	</element>
+
+	<complexType name="information">
+		<attribute name="profile" type="string" use="required"/>
+		<attribute name="image" type="string" default="" />
+		<attribute name="version" type="string" default=""/>
+	</complexType>
+
+	<complexType name="itemGroup">
+		<sequence>
+			<element name="item" type="em-template:item" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="string" default=""/>
+	</complexType>
+
+	<complexType name="item">
+		<sequence>
+			<element name="option" type="em-template:option" minOccurs="0" maxOccurs="unbounded"/>
+			<element name="item" type="em-template:item" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="string" use="required"/>
+		<attribute name="type" type="string" default=""/>
+		<attribute name="title" type="string" default=""/>
+	</complexType>
+
+	<complexType name="option">
+		<simpleContent>
+				<extension base="string">
+					<attribute name="name" use="required"/>
+					<attribute name="attr" default=""/>
+				</extension>
+		</simpleContent>
+	</complexType>
+
+</schema>
diff --git a/xsd/x86-standard-template2.xml b/xsd/x86-standard-template2.xml
new file mode 100644
index 0000000..5d1d654
--- /dev/null
+++ b/xsd/x86-standard-template2.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- This file describes component of VM property UI in Emulator manager.
+	(VM property UI descriptor)
+	Each element in this file is matched with an item of vm property UI. -->
+
+<ItemList xmlns="http://www.tizen.org/em/template" version="2.0">
+	<information profile="mobile" version="2.4" image="x86-standard"/>
+
+	<itemGroup name="default">
+		<item type="text" name="vmName" title="Name"/>
+		<item type="file" name="baseImage" title="Base Image">
+			<option name="dialogType">file</option>
+		</item>
+		<item type="label" name="display" title="Display">
+			<item type="combo" name="resolution" title="Resolution">
+				<!-- name, width, height, dpi -->
+				<option name="320" attr="experimental"> ,320,320,316 </option>
+				<option name="hvga" attr="experimental"> HVGA,320,480,160 </option>
+				<option name="wvga"> WVGA,480,800,233 </option>
+				<option name="wsvga"> WSVGA,600,1024,207 </option>
+				<option name="WSVGA" attr="experimental"> WSVGA,600,1024,207 </option>
+				<option name="qhd"> qHD,540,960,220 </option>
+				<option name="hd"> HD,720,1280,306 </option>
+				<option name="WXGA" attr="experimental"> WXGA,1280,800,300 </option>
+				<option name="WQXGA" attr="experimental"> WQXGA,2560,1600,301 </option>
+				<option name="FULLHD" attr="experimental"> FULLHD,1080,1920,314 </option>
+			</item>
+			<item type="spinner" name="dpi" title="Density"/>
+			<item type="combo" name="skin" title="Skin"/>
+		</item>
+		<item type="combo" name="processors" title="Processors" />
+		<item type="combo" name="ramSize" title="RAM Size">
+			<option name="list">512,768,1024</option>
+		</item>
+		<item type="toggle" name="suspendSupport" title="Suspend">
+			<option name="experimental">true</option>
+		</item>
+<!-- 		<item type="combo" name="maxTouch" title="Max Touch Point"/> -->
+		<item type="label" name="fileShare" title="File Sharing">
+			<item type="toggle" name="share" title="Sharing"/>
+			<item type="file" name="directory" title="Directory">
+				<option name="dialogType">directory</option>
+			</item>
+		</item>
+		<item type="label" name="hwSupport" title="HW Support">
+			<item type="toggle" name="cpu" title="CPU VT"/>
+			<item type="toggle" name="gpu" title="GPU"/>
+		</item>
+		<item type="combo" name="glVersion" title="OpenGL ES Ver">
+			<option name="v2.0_v3.0">v2.0 &amp; v3.0</option>
+			<option name="v1.1_v2.0">v1.1 &amp; v2.0</option>
+			<option name="supportOS">mac</option>
+		</item>
+
+		<item name="kernel" type="hidden"/>
+		<item name="default" type="hidden"/>
+		<item name="remote" type="hidden"/>
+		<item name="maxTouch" type="hidden"/>
+		<item name="power" type="hidden"/>
+	</itemGroup>
+
+<!-- Followings are drawn as check box in Emulator Manager vm property UI.-->
+	<itemGroup name="advanced">
+		<item type="lineLabel" name="advancedOption" title="Advanced Option"/>
+		<item type="label" name="camera" title="Camera">
+<!-- 			<item type="combo" name="frontType" title="Front"/> -->
+<!-- 			<item type="file" name="frontImage" title="(image)"/> -->
+			<item type="combo" name="rearType" title="Rear"/>
+			<item type="file" name="rearImage" title="(image)"/>
+		</item>
+		<item type="checkLabel" name="sensor" title="Sensor">
+			<item type="checkbox" name="accel" title="Accelerometer"/>
+			<item type="checkbox" name="gyro" title="Gyroscope"/>
+			<item type="checkbox" name="geo" title="Geo-magnetic"/>
+			<item type="checkbox" name="proxi" title="Proximity"/>
+			<item type="checkbox" name="light" title="Light"/>
+			<item type="checkbox" name="haptic" title="Haptic"/>
+			<item type="checkbox" name="press" title="Pressure"/>
+			<item type="checkbox" name="uv" title="Ultraviolet"/>
+			<item type="checkbox" name="hrm" title="Heartbeat Rate"/>
+		</item>
+		<item type="checkLabel" name="device" title="Device">
+			<item type="checkbox" name="nfc" title="NFC"/>
+		</item>
+
+		<!-- Network configuration -->
+		<item name="netConfig" type="lineLabel" title="Network Configuration">
+			<option name="spreadOnStart">false</option>
+		</item>
+		<item name="proxy" type="combo" title="Proxy">
+			<option name="none">No proxy</option>
+			<option name="auto">Use host proxy</option>
+			<option name="manual">Use manual proxy</option>
+			<option name="defaultOnCreate">auto</option>
+		</item>
+		<item name="netConnectType" type="combo" title="Connect Type">
+			<option name="list">NAT, Bridge</option>
+		</item>
+		<item name="netTapDevice" type="combo" title="Base Network">
+			<option name="supportOS">mac,linux</option>
+		</item>
+		<item name="netTapDevice" type="combo" title="Tap Device">
+			<option name="supportOS">win</option>
+		</item>
+		<item name="netIpInfo" type="label" title="VM IP info">
+			<item name="useDHCP" type="checkbox" title="Use DHCP">
+				<option name="defaultOnCreate">off</option>
+			</item>
+			<item name="ipAddr" type="text" title="IP Address" />
+			<item name="subnet" type="text" title="Subnet" />
+			<item name="gateway" type="text" title="Gateway" />
+		</item>
+		<item name="netDns" type="text" title="DNS" />
+		<item name="netMac" type="text" title="MAC" />
+
+		<item type="lineLabel" name="experimental" title="Experimental Options"/>
+		<item type="label" name="viewer" title="Viewer">
+			<item type="combo" name="type" title="Type">
+				<option name="list">Native, Web</option>
+				<option name="defaultOnCreate">Native</option>
+			</item>
+		</item>
+	</itemGroup>
+
+</ItemList>
+
-- 
2.7.4