diff --git a/README.md b/README.md
index 805c623..4283c5d 100644
--- a/README.md
+++ b/README.md
@@ -5,20 +5,22 @@ Magicorn made Terraform Module for AWS Provider
 ```
 module "elasticache" {
   source         = "magicorntech/elasticache/aws"
-  version        = "0.0.2"
+  version        = "0.0.3"
   tenant         = var.tenant
   name           = var.name
   environment    = var.environment
   vpc_id         = var.vpc_id
   cidr_block     = var.cidr_block
   subnet_ids     = var.subnet_ids
+  encryption     = true # 1
+  kms_key_id     = var.elasticache_key_id
 
   # ElastiCache Configuration
+  cache_name                 = "master"
   multi_az                   = false
   replica_count              = 1
-  instance_type              = "cache.t4g.small"
+  instance_type              = "cache.t4g.micro"
   port                       = 6379
-  encryption                 = true
   auto_minor_version_upgrade = false
   engine_version             = "7.0"
   parameter_group            = "default.redis7"
@@ -26,4 +28,7 @@ module "elasticache" {
   snapshot_window            = "04:00-05:00"
   snapshot_retention_limit   = 3
 }
-```
\ No newline at end of file
+```
+
+## Notes
+1) Works better with magicorn-aws-kms module.
\ No newline at end of file
diff --git a/kms.tf b/kms.tf
deleted file mode 100644
index a65f04d..0000000
--- a/kms.tf
+++ /dev/null
@@ -1,70 +0,0 @@
-resource "aws_kms_key" "main" {
-  count                   = (var.encryption == true) ? 1 : 0
-  description             = "${var.tenant}-${var.name}-elasticache-kms-${var.environment}"
-  key_usage               = "ENCRYPT_DECRYPT" 
-  deletion_window_in_days = 7
-  enable_key_rotation     = true
-  multi_region            = false
-  is_enabled              = true
-
-  policy = <<EOF
-{
-    "Version": "2012-10-17",
-    "Id": "auto-elasticache-1",
-    "Statement": [
-        {
-            "Sid": "Allow access through ElastiCache for all principals in the account that are authorized to use ElastiCache",
-            "Effect": "Allow",
-            "Principal": {
-                "AWS": "*"
-            },
-            "Action": [
-                "kms:Encrypt",
-                "kms:Decrypt",
-                "kms:ReEncrypt*",
-                "kms:GenerateDataKey*",
-                "kms:CreateGrant",
-                "kms:ListGrants",
-                "kms:DescribeKey"
-            ],
-            "Resource": "*",
-            "Condition": {
-                "StringEquals": {
-                    "kms:ViaService": "elasticache.${data.aws_region.current.name}.amazonaws.com",
-                    "kms:CallerAccount": "${data.aws_caller_identity.current.account_id}"
-                }
-            }
-        },
-        {
-            "Sid": "Allow direct access to key metadata to the account",
-            "Effect": "Allow",
-            "Principal": {
-                "AWS": [
-                  "arn:aws:iam::${data.aws_caller_identity.current.account_id}:root",
-                  "${data.aws_caller_identity.current.arn}"
-                ]
-            },
-            "Action": [
-                "kms:*"
-            ],
-            "Resource": "*"
-        }
-    ]
-}
-EOF
-
-  tags = {
-    Name        = "${var.tenant}-${var.name}-elasticache-kms-${var.environment}"
-    Tenant      = var.tenant
-    Project     = var.name
-    Environment = var.environment
-    Maintainer  = "Magicorn"
-    Terraform   = "yes"
-  }
-}
-
-resource "aws_kms_alias" "main" {
-  count         = (var.encryption == true) ? 1 : 0
-  name          = "alias/${var.tenant}/${var.name}/elasticache/${var.environment}"
-  target_key_id = aws_kms_key.main[0].key_id
-}
\ No newline at end of file
diff --git a/redis.tf b/redis.tf
index df20b74..f13fafe 100644
--- a/redis.tf
+++ b/redis.tf
@@ -9,23 +9,23 @@ resource "aws_elasticache_replication_group" "main" {
   transit_encryption_enabled         = (var.encryption == true) ? true : false
   auth_token                         = (var.encryption == true) ? random_password.auth[0].result : null
   at_rest_encryption_enabled         = (var.encryption == true) ? true : false
-  kms_key_id                         = (var.encryption == true) ? aws_kms_key.main[0].arn : null
+  kms_key_id                         = (var.encryption == true) ? var.kms_key_id : null
   engine                             = "redis"
   engine_version                     = var.engine_version
   port                               = var.port
-  replication_group_id               = "${var.tenant}-${var.name}-redis-${var.environment}"
+  replication_group_id               = "${var.tenant}-${var.name}-${var.cache_name}-${var.environment}"
   description                        = "Managed by Magicorn"
   node_type                          = var.instance_type
   parameter_group_name               = var.parameter_group
   maintenance_window                 = var.maintenance_window
   snapshot_window                    = var.snapshot_window
   snapshot_retention_limit           = var.snapshot_retention_limit
-  final_snapshot_identifier          = "${var.tenant}-${var.name}-redis-final-${random_id.backup.hex}-${var.environment}"
+  final_snapshot_identifier          = "${var.tenant}-${var.name}-${var.cache_name}-final-${random_id.backup.hex}-${var.environment}"
   subnet_group_name                  = aws_elasticache_subnet_group.main.name
   security_group_ids                 = [aws_security_group.main.id]
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-redis-${var.environment}"
+    Name        = "${var.tenant}-${var.name}-${var.cache_name}-${var.environment}"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
diff --git a/sg.tf b/sg.tf
index a168727..535d104 100644
--- a/sg.tf
+++ b/sg.tf
@@ -1,5 +1,5 @@
 resource "aws_security_group" "main" {
-  name        = "${var.tenant}-${var.name}-elasticache-sg-${var.environment}"
+  name        = "${var.tenant}-${var.name}-elasticache-${var.cache_name}-sg-${var.environment}"
   description = "Managed by Magicorn"
   vpc_id      = var.vpc_id
 
@@ -22,7 +22,7 @@ resource "aws_security_group" "main" {
   }
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-elasticache-sg-${var.environment}"
+    Name        = "${var.tenant}-${var.name}-elasticache-${var.cache_name}-sg-${var.environment}"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
diff --git a/snetg.tf b/snetg.tf
index ddc36c3..57fadb5 100644
--- a/snetg.tf
+++ b/snetg.tf
@@ -1,10 +1,10 @@
 resource "aws_elasticache_subnet_group" "main" {
-  name        = "${var.tenant}-${var.name}-redis-snetg-${var.environment}"
+  name        = "${var.tenant}-${var.name}-${var.cache_name}-snetg-${var.environment}"
   description = "Managed by Magicorn"
   subnet_ids  = var.subnet_ids
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-redis-snetg-${var.environment}"
+    Name        = "${var.tenant}-${var.name}-${var.cache_name}-snetg-${var.environment}"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
diff --git a/ssm.tf b/ssm.tf
index 2114f0e..6e875d7 100644
--- a/ssm.tf
+++ b/ssm.tf
@@ -9,13 +9,13 @@ resource "random_password" "auth" {
 
 resource "aws_ssm_parameter" "main_redis_pass" {
   count       = (var.encryption == true) ? 1 : 0
-  name        = "/${var.tenant}/${var.name}/${var.environment}/redis/pass"
+  name        = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/pass"
   description = "Managed by Magicorn"
   type        = "SecureString"
   value       = random_password.auth[0].result
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-${var.environment}-redis-pass"
+    Name        = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-pass"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
@@ -26,13 +26,13 @@ resource "aws_ssm_parameter" "main_redis_pass" {
 
 resource "aws_ssm_parameter" "main_redis_primary" {
   count       = (var.encryption == true) ? 1 : 0
-  name        = "/${var.tenant}/${var.name}/${var.environment}/redis/primary"
+  name        = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/primary"
   description = "Managed by Magicorn"
   type        = "SecureString"
   value       = aws_elasticache_replication_group.main.primary_endpoint_address
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-${var.environment}-redis-primary"
+    Name        = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-primary"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
@@ -43,13 +43,13 @@ resource "aws_ssm_parameter" "main_redis_primary" {
 
 resource "aws_ssm_parameter" "main_redis_reader" {
   count       = (var.encryption == true) ? 1 : 0
-  name        = "/${var.tenant}/${var.name}/${var.environment}/redis/reader"
+  name        = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/reader"
   description = "Managed by Magicorn"
   type        = "SecureString"
   value       = aws_elasticache_replication_group.main.reader_endpoint_address
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-${var.environment}-redis-reader"
+    Name        = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-reader"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
@@ -60,13 +60,13 @@ resource "aws_ssm_parameter" "main_redis_reader" {
 
 resource "aws_ssm_parameter" "main_redis_port" {
   count       = (var.encryption == true) ? 1 : 0
-  name        = "/${var.tenant}/${var.name}/${var.environment}/redis/port"
+  name        = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/port"
   description = "Managed by Magicorn"
   type        = "SecureString"
   value       = var.port
 
   tags = {
-    Name        = "${var.tenant}-${var.name}-${var.environment}-redis-port"
+    Name        = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-port"
     Tenant      = var.tenant
     Project     = var.name
     Environment = var.environment
diff --git a/variables.tf b/variables.tf
index cef635f..c2a9cda 100644
--- a/variables.tf
+++ b/variables.tf
@@ -4,12 +4,14 @@ variable "environment" {}
 variable "vpc_id" {}
 variable "cidr_block" {}
 variable "subnet_ids" {}
+variable "encryption" {}
+variable "kms_key_id" {}
+variable "cache_name" {}
 variable "multi_az" {}
 variable "replica_count" {}
 variable "engine_version" {}
 variable "instance_type" {}
 variable "port" {}
-variable "encryption" {}
 variable "auto_minor_version_upgrade" {}
 variable "parameter_group" {}
 variable "maintenance_window" {}