diff --git a/sahara/plugins/cdh/v5/versionhandler.py b/sahara/plugins/cdh/v5/versionhandler.py
index f0138c69..fd1a7156 100644
--- a/sahara/plugins/cdh/v5/versionhandler.py
+++ b/sahara/plugins/cdh/v5/versionhandler.py
@@ -37,25 +37,16 @@ class VersionHandler(avm.AbstractVersionHandler):
     def get_node_processes(self):
         return {
             "CLOUDERA": ['CLOUDERA_MANAGER'],
-            "HDFS": [],
-            "NAMENODE": ['HDFS_NAMENODE'],
-            "DATANODE": ['HDFS_DATANODE'],
-            "SECONDARYNAMENODE": ['HDFS_SECONDARYNAMENODE'],
-            "YARN": [],
-            "RESOURCEMANAGER": ['YARN_RESOURCEMANAGER'],
-            "NODEMANAGER": ['YARN_NODEMANAGER'],
-            "JOBHISTORY": ['YARN_JOBHISTORY'],
+            "HDFS": ['HDFS_NAMENODE', 'HDFS_DATANODE',
+                     'HDFS_SECONDARYNAMENODE'],
+            "YARN": ['YARN_RESOURCEMANAGER', 'YARN_NODEMANAGER',
+                     'YARN_JOBHISTORY'],
             "OOZIE": ['OOZIE_SERVER'],
-            "HIVE": [],
-            "HIVESERVER": ['HIVE_SERVER2'],
-            "HIVEMETASTORE": ['HIVE_METASTORE'],
-            "WEBHCAT": ['HIVE_WEBHCAT'],
+            "HIVE": ['HIVE_SERVER2', 'HIVE_METASTORE', 'HIVE_WEBHCAT'],
             "HUE": ['HUE_SERVER'],
             "SPARK_ON_YARN": ['SPARK_YARN_HISTORY_SERVER'],
             "ZOOKEEPER": ['ZOOKEEPER_SERVER'],
-            "HBASE": [],
-            "MASTER": ['HBASE_MASTER'],
-            "REGIONSERVER": ['HBASE_REGIONSERVER'],
+            "HBASE": ['HBASE_MASTER', 'HBASE_REGIONSERVER'],
             "YARN_GATEWAY": [],
             "HDFS_GATEWAY": []
         }
diff --git a/sahara/plugins/cdh/v5_3_0/versionhandler.py b/sahara/plugins/cdh/v5_3_0/versionhandler.py
index d051ca9b..ad2379cc 100644
--- a/sahara/plugins/cdh/v5_3_0/versionhandler.py
+++ b/sahara/plugins/cdh/v5_3_0/versionhandler.py
@@ -37,30 +37,18 @@ class VersionHandler(avm.AbstractVersionHandler):
     def get_node_processes(self):
         return {
             "CLOUDERA": ['CLOUDERA_MANAGER'],
-            "HDFS": [],
-            "NAMENODE": ['HDFS_NAMENODE'],
-            "DATANODE": ['HDFS_DATANODE'],
-            "SECONDARYNAMENODE": ['HDFS_SECONDARYNAMENODE'],
-            "YARN": [],
-            "RESOURCEMANAGER": ['YARN_RESOURCEMANAGER'],
-            "NODEMANAGER": ['YARN_NODEMANAGER'],
-            "JOBHISTORY": ['YARN_JOBHISTORY'],
+            "HDFS": ['HDFS_NAMENODE', 'HDFS_DATANODE',
+                     'HDFS_SECONDARYNAMENODE'],
+            "YARN": ['YARN_RESOURCEMANAGER', 'YARN_NODEMANAGER',
+                     'YARN_JOBHISTORY'],
             "OOZIE": ['OOZIE_SERVER'],
-            "HIVE": [],
-            "HIVESERVER": ['HIVE_SERVER2'],
-            "HIVEMETASTORE": ['HIVE_METASTORE'],
-            "WEBHCAT": ['HIVE_WEBHCAT'],
+            "HIVE": ['HIVE_SERVER2', 'HIVE_METASTORE', 'HIVE_WEBHCAT'],
             "HUE": ['HUE_SERVER'],
             "SPARK_ON_YARN": ['SPARK_YARN_HISTORY_SERVER'],
             "ZOOKEEPER": ['ZOOKEEPER_SERVER'],
-            "HBASE": [],
-            "MASTER": ['HBASE_MASTER'],
-            "REGIONSERVER": ['HBASE_REGIONSERVER'],
+            "HBASE": ['HBASE_MASTER', 'HBASE_REGIONSERVER'],
             "FLUME": ['FLUME_AGENT'],
-            "IMPALA": [],
-            "CATALOGSERVER": ['IMPALA_CATALOGSERVER'],
-            "STATESTORE": ['IMPALA_STATESTORE'],
-            "IMPALAD": ['IMPALAD'],
+            "IMPALA": ['IMPALA_CATALOGSERVER', 'IMPALA_STATESTORE', 'IMPALAD'],
             "KS_INDEXER": ['KEY_VALUE_STORE_INDEXER'],
             "SOLR": ['SOLR_SERVER'],
             "SQOOP": ['SQOOP_SERVER'],
diff --git a/sahara/plugins/cdh/v5_4_0/versionhandler.py b/sahara/plugins/cdh/v5_4_0/versionhandler.py
index 717a8a28..f25a49c6 100644
--- a/sahara/plugins/cdh/v5_4_0/versionhandler.py
+++ b/sahara/plugins/cdh/v5_4_0/versionhandler.py
@@ -38,39 +38,25 @@ class VersionHandler(avm.AbstractVersionHandler):
     def get_node_processes(self):
         return {
             "CLOUDERA": ['CLOUDERA_MANAGER'],
-            "HDFS": [],
-            "NAMENODE": ['HDFS_NAMENODE'],
-            "DATANODE": ['HDFS_DATANODE'],
-            "SECONDARYNAMENODE": ['HDFS_SECONDARYNAMENODE'],
-            "YARN": [],
-            "RESOURCEMANAGER": ['YARN_RESOURCEMANAGER'],
-            "NODEMANAGER": ['YARN_NODEMANAGER'],
-            "JOBHISTORY": ['YARN_JOBHISTORY'],
+            "HDFS": ['HDFS_NAMENODE', 'HDFS_DATANODE',
+                     'HDFS_SECONDARYNAMENODE', 'HDFS_JOURNALNODE'],
+            "YARN": ['YARN_RESOURCEMANAGER', 'YARN_NODEMANAGER',
+                     'YARN_JOBHISTORY', 'YARN_STANDBYRM'],
             "OOZIE": ['OOZIE_SERVER'],
-            "HIVE": [],
-            "HIVESERVER": ['HIVE_SERVER2'],
-            "HIVEMETASTORE": ['HIVE_METASTORE'],
-            "WEBHCAT": ['HIVE_WEBHCAT'],
+            "HIVE": ['HIVE_SERVER2', 'HIVE_METASTORE', 'HIVE_WEBHCAT'],
             "HUE": ['HUE_SERVER'],
             "SPARK_ON_YARN": ['SPARK_YARN_HISTORY_SERVER'],
             "ZOOKEEPER": ['ZOOKEEPER_SERVER'],
-            "HBASE": [],
-            "MASTER": ['HBASE_MASTER'],
-            "REGIONSERVER": ['HBASE_REGIONSERVER'],
+            "HBASE": ['HBASE_MASTER', 'HBASE_REGIONSERVER'],
             "FLUME": ['FLUME_AGENT'],
-            "IMPALA": [],
-            "CATALOGSERVER": ['IMPALA_CATALOGSERVER'],
-            "STATESTORE": ['IMPALA_STATESTORE'],
-            "IMPALAD": ['IMPALAD'],
+            "IMPALA": ['IMPALA_CATALOGSERVER', 'IMPALA_STATESTORE', 'IMPALAD'],
             "KS_INDEXER": ['KEY_VALUE_STORE_INDEXER'],
             "SOLR": ['SOLR_SERVER'],
             "SQOOP": ['SQOOP_SERVER'],
             "SENTRY": ['SENTRY_SERVER'],
             "KMS": ['KMS'],
             "YARN_GATEWAY": [],
-            "HDFS_GATEWAY": [],
-            "JOURNALNODE": ['HDFS_JOURNALNODE'],
-            "STANDBYRESOURCEMANAGER": ['YARN_STANDBYRM']
+            "HDFS_GATEWAY": []
         }
 
     def validate(self, cluster):