diff --git a/java/monasca-common-hibernate/src/main/java/monasca/common/hibernate/db/NotificationMethodDb.java b/java/monasca-common-hibernate/src/main/java/monasca/common/hibernate/db/NotificationMethodDb.java
index 41988148..e63e10f6 100644
--- a/java/monasca-common-hibernate/src/main/java/monasca/common/hibernate/db/NotificationMethodDb.java
+++ b/java/monasca-common-hibernate/src/main/java/monasca/common/hibernate/db/NotificationMethodDb.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 FUJITSU LIMITED
- * (C) Copyright 2016 Hewlett Packard Enterprise Development Company LP
+ * (C) Copyright 2016 Hewlett Packard Enterprise Development LP
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -53,8 +53,7 @@ public class NotificationMethodDb
   private String name;
 
   @Column(name = "type", nullable = false)
-  @Enumerated(EnumType.STRING)
-  private AlarmNotificationMethodType type;
+  private String type;
 
   @Column(name = "address", length = 512, nullable = false)
   private String address;
@@ -69,7 +68,7 @@ public class NotificationMethodDb
   public NotificationMethodDb(String id,
                               String tenantId,
                               String name,
-                              AlarmNotificationMethodType type,
+                              String type,
                               String address,
                               Integer period,
                               DateTime created_at,
@@ -85,7 +84,7 @@ public class NotificationMethodDb
   public NotificationMethodDb(String id,
                               String tenantId,
                               String name,
-                              AlarmNotificationMethodType type,
+                              String type,
                               String address,
                               DateTime created_at,
                               DateTime updated_at) {
@@ -102,7 +101,7 @@ public class NotificationMethodDb
     return this;
   }
 
-  public NotificationMethodDb setType(final AlarmNotificationMethodType type) {
+  public NotificationMethodDb setType(final String type) {
     this.type = type;
     return this;
   }
@@ -130,7 +129,7 @@ public class NotificationMethodDb
     return this.name;
   }
 
-  public AlarmNotificationMethodType getType() {
+  public String getType() {
     return this.type;
   }
 
diff --git a/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmNotificationMethodType.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmNotificationMethodType.java
index 70abf457..55408670 100644
--- a/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmNotificationMethodType.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmNotificationMethodType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+ * (C) Copyright 2014,2016 Hewlett Packard Enterprise Development LP
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,14 @@
  */
 package monasca.common.model.alarm;
 
-public enum AlarmNotificationMethodType {
-  EMAIL, WEBHOOK, PAGERDUTY;
+public class AlarmNotificationMethodType {
+
+  public static final String EMAIL = "EMAIL";
+  public static final String WEBHOOK = "WEBHOOK";
+  public static final String PAGERDUTY = "PAGERDUTY";
+  
+  public static String valueOf(String alarmType)
+  {
+	return alarmType.toUpperCase();
+  }
 }